← Back to branch summary

~maas-committers/maas/trunk

~maas-committers/maas/trunk

Viewing all changes in revision 3629.7.4.

Committer: ubuntudotcom1
Date: 2015-03-26 00:12:12 UTC
mfrom: (3724 maas)
mto: This revision was merged to the branch mainline in revision 3725.
Revision ID: ubuntudotcom1-20150326001212-rlzfn0kd5en4ssy1

Merge trunk.

files added:
src/maasserver/migrations/0135_staticipaddress_hostname.py

src/maasserver/static/img/icons/debug.png

src/maasserver/static/img/icons/debug.svg

src/maasserver/static/js/angular/directives/dbl_click_overlay.js

src/maasserver/static/js/angular/directives/tests/test_dbl_click_overlay.js

src/maasserver/static/js/angular/factories/tests/test_users.js

src/maasserver/static/js/angular/factories/users.js

src/maasserver/static/scss/maas/components/_accordion.scss

src/maasserver/static/scss/maas/components/_search.scss

src/maasserver/utils/dns.py

src/maasserver/utils/tests/test_dns.py

src/maasserver/websockets/handlers/tests/test_user.py

src/maasserver/websockets/handlers/user.py

src/provisioningserver/utils/backoff.py

src/provisioningserver/utils/tests/test_backoff.py

files removed:
docs/man/maas-import-pxe-files.8.rst

man/maas-import-pxe-files.8

files modified:
.bzrignore

.gitignore

Makefile

docs/conf.py

docs/configure.rst

setup.py

src/maasserver/api/ip_addresses.py

src/maasserver/api/tests/test_ipaddresses.py

src/maasserver/context_processors.py

src/maasserver/dhcp.py

src/maasserver/dns/config.py

src/maasserver/fixtures/dev_fixture.yaml

src/maasserver/models/node.py

src/maasserver/models/nodegroupinterface.py

src/maasserver/models/staticipaddress.py

src/maasserver/models/tests/test_node.py

src/maasserver/models/tests/test_staticipaddress.py

src/maasserver/rpc/tests/test_nodes.py

src/maasserver/static/css/maas-styles.css

src/maasserver/static/js/angular/controllers/node_details.js

src/maasserver/static/js/angular/controllers/tests/test_node_details.js

src/maasserver/static/js/angular/directives/power_parameters.js

src/maasserver/static/js/angular/directives/tests/test_power_parameters.js

src/maasserver/static/js/angular/services/manager.js

src/maasserver/static/js/angular/services/tests/test_manager.js

src/maasserver/static/partials/node-details.html

src/maasserver/static/partials/nodes-list.html

src/maasserver/static/scss/maas/_mixins.scss

src/maasserver/static/scss/maas/components/_button.scss

src/maasserver/static/scss/maas/components/_forms.scss

src/maasserver/static/scss/maas/components/_placeholders.scss

src/maasserver/static/scss/maas/components/_tables.scss

src/maasserver/static/scss/maas/layout/_grids.scss

src/maasserver/static/scss/maas/layout/_headers.scss

src/maasserver/static/scss/maas/pages/_nodes.scss

src/maasserver/static/scss/maas/styles.scss

src/maasserver/templates/maasserver/prefs.html

src/maasserver/testing/testcase.py

src/maasserver/tests/test_dhcp.py

src/maasserver/tests/test_triggers.py

src/maasserver/triggers.py

src/maasserver/utils/orm.py

src/maasserver/utils/tests/test_orm.py

src/maasserver/utils/tests/test_views.py

src/maasserver/utils/views.py

src/maasserver/websockets/handlers/__init__.py

src/maasserver/websockets/handlers/node.py

src/maasserver/websockets/handlers/tests/test_node.py

src/maasserver/websockets/protocol.py

src/maasserver/websockets/tests/test_listener.py

src/maasserver/websockets/tests/test_protocol.py

src/maastesting/matchers.py

src/maastesting/tests/test_matchers.py

src/provisioningserver/upgrade_cluster.py

src/provisioningserver/utils/tests/test_twisted.py

src/provisioningserver/utils/twisted.py

Show diffs side-by-side

added added

removed removed

docs/configure.rst

docs/man/maas-import-pxe-files.8.rst

man/maas-import-pxe-files.8

src/maasserver/api/ip_addresses.py

src/maasserver/api/tests/test_ipaddresses.py

src/maasserver/context_processors.py

src/maasserver/dhcp.py

src/maasserver/dns/config.py

src/maasserver/fixtures/dev_fixture.yaml

src/maasserver/migrations/0135_staticipaddress_hostname.py

src/maasserver/models/node.py

src/maasserver/models/nodegroupinterface.py

src/maasserver/models/staticipaddress.py

src/maasserver/models/tests/test_node.py

src/maasserver/models/tests/test_staticipaddress.py

src/maasserver/rpc/tests/test_nodes.py

src/maasserver/static/css/maas-styles.css

src/maasserver/static/img/icons/debug.png

src/maasserver/static/img/icons/debug.svg

src/maasserver/static/js/angular/controllers/node_details.js

src/maasserver/static/js/angular/controllers/tests/test_node_details.js

src/maasserver/static/js/angular/directives/dbl_click_overlay.js

src/maasserver/static/js/angular/directives/power_parameters.js

src/maasserver/static/js/angular/directives/tests/test_dbl_click_overlay.js

src/maasserver/static/js/angular/directives/tests/test_power_parameters.js

src/maasserver/static/js/angular/factories/tests/test_users.js

src/maasserver/static/js/angular/factories/users.js

src/maasserver/static/js/angular/services/manager.js

src/maasserver/static/js/angular/services/tests/test_manager.js

src/maasserver/static/partials/node-details.html

src/maasserver/static/partials/nodes-list.html

src/maasserver/static/scss/maas/_mixins.scss

src/maasserver/static/scss/maas/components/_accordion.scss

src/maasserver/static/scss/maas/components/_button.scss

src/maasserver/static/scss/maas/components/_forms.scss

src/maasserver/static/scss/maas/components/_placeholders.scss

src/maasserver/static/scss/maas/components/_search.scss

src/maasserver/static/scss/maas/components/_tables.scss

src/maasserver/static/scss/maas/layout/_grids.scss

src/maasserver/static/scss/maas/layout/_headers.scss

src/maasserver/static/scss/maas/pages/_nodes.scss

src/maasserver/static/scss/maas/styles.scss

src/maasserver/templates/maasserver/prefs.html

src/maasserver/testing/testcase.py

src/maasserver/tests/test_dhcp.py

src/maasserver/tests/test_triggers.py

src/maasserver/triggers.py

src/maasserver/utils/dns.py

src/maasserver/utils/orm.py

src/maasserver/utils/tests/test_dns.py

src/maasserver/utils/tests/test_orm.py

src/maasserver/utils/tests/test_views.py

src/maasserver/utils/views.py

src/maasserver/websockets/handlers/__init__.py

src/maasserver/websockets/handlers/node.py

src/maasserver/websockets/handlers/tests/test_node.py

src/maasserver/websockets/handlers/tests/test_user.py

src/maasserver/websockets/handlers/user.py

src/maasserver/websockets/protocol.py

src/maasserver/websockets/tests/test_listener.py

src/maasserver/websockets/tests/test_protocol.py

src/maastesting/matchers.py

src/maastesting/tests/test_matchers.py

src/provisioningserver/upgrade_cluster.py

src/provisioningserver/utils/backoff.py

src/provisioningserver/utils/tests/test_backoff.py

src/provisioningserver/utils/tests/test_twisted.py

src/provisioningserver/utils/twisted.py

Older »