← Back to branch summary

~lamont/maas/dns-discovery

~lamont/maas/dns-discovery

Viewing all changes in revision 4642.2.18.

Committer: LaMont Jones
Date: 2016-02-17 16:12:30 UTC
mfrom: (4663 maas)
mto: This revision was merged to the branch mainline in revision 4670.
Revision ID: lamont@canonical.com-20160217161230-k1e3sn3b2y5r9c26

merge from trunk.

files added:
src/maasserver/migrations/builtin/maasserver/0032_loosen_vlan.py

src/maasserver/migrations/builtin/maasserver/0033_iprange_minor_changes.py

src/maasserver/static/img/icons/green-tick.svg

src/maasserver/static/img/icons/notification-error.png

src/maasserver/static/img/icons/tree-level.png

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

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

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

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

src/maasserver/system_controller.py

src/maasserver/tests/test_system_controller.py

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

files modified:
src/maasserver/api/ip_addresses.py

src/maasserver/api/tests/test_machine.py

src/maasserver/api/tests/test_subnets.py

src/maasserver/api/tests/test_vlans.py

src/maasserver/api/vlans.py

src/maasserver/enum.py

src/maasserver/eventloop.py

src/maasserver/forms_vlan.py

src/maasserver/listener.py

src/maasserver/migrations/builtin/maasserver/0014_add_region_models.py

src/maasserver/migrations/builtin/maasserver/0031_add_region_rack_rpc_conn_model.py

src/maasserver/models/filesystem.py

src/maasserver/models/interface.py

src/maasserver/models/iprange.py

src/maasserver/models/node.py

src/maasserver/models/staticipaddress.py

src/maasserver/models/subnet.py

src/maasserver/models/tests/test_filesystem.py

src/maasserver/models/tests/test_interface.py

src/maasserver/models/tests/test_staticipaddress.py

src/maasserver/models/vlan.py

src/maasserver/preseed_storage.py

src/maasserver/rpc/regionservice.py

src/maasserver/rpc/tests/test_regionservice.py

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

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

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

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

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

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

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

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

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

src/maasserver/static/js/angular/maas.js

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

src/maasserver/static/scss/maas/base/_base.scss

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

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

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

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

src/maasserver/testing/factory.py

src/maasserver/tests/test_eventloop.py

src/maasserver/tests/test_forms_vlan.py

src/maasserver/tests/test_listener.py

src/maasserver/tests/test_node_action.py

src/maasserver/tests/test_plugin.py

src/maasserver/tests/test_preseed_storage.py

src/maasserver/triggers/system.py

src/maasserver/triggers/tests/test_system_listener.py

src/maasserver/views/combo.py

src/maasserver/websockets/handlers/controller.py

src/maasserver/websockets/handlers/general.py

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

src/maasserver/websockets/tests/test_protocol.py

src/metadataserver/api.py

Show diffs side-by-side

added added

removed removed

src/maasserver/api/ip_addresses.py

src/maasserver/api/tests/test_machine.py

src/maasserver/api/tests/test_subnets.py

src/maasserver/api/tests/test_vlans.py

src/maasserver/api/vlans.py

src/maasserver/enum.py

src/maasserver/eventloop.py

src/maasserver/forms_vlan.py

src/maasserver/listener.py

src/maasserver/migrations/builtin/maasserver/0014_add_region_models.py

src/maasserver/migrations/builtin/maasserver/0031_add_region_rack_rpc_conn_model.py

src/maasserver/migrations/builtin/maasserver/0032_loosen_vlan.py

src/maasserver/migrations/builtin/maasserver/0033_iprange_minor_changes.py

src/maasserver/models/filesystem.py

src/maasserver/models/interface.py

src/maasserver/models/iprange.py

src/maasserver/models/node.py

src/maasserver/models/staticipaddress.py

src/maasserver/models/subnet.py

src/maasserver/models/tests/test_filesystem.py

src/maasserver/models/tests/test_interface.py

src/maasserver/models/tests/test_staticipaddress.py

src/maasserver/models/vlan.py

src/maasserver/preseed_storage.py

src/maasserver/rpc/regionservice.py

src/maasserver/rpc/tests/test_regionservice.py

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

src/maasserver/static/img/icons/green-tick.svg

src/maasserver/static/img/icons/notification-error.png

src/maasserver/static/img/icons/tree-level.png

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

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

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

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

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

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

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

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

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

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

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

src/maasserver/static/js/angular/maas.js

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

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

src/maasserver/static/scss/maas/base/_base.scss

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

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

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

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

src/maasserver/system_controller.py

src/maasserver/testing/factory.py

src/maasserver/tests/test_eventloop.py

src/maasserver/tests/test_forms_vlan.py

src/maasserver/tests/test_listener.py

src/maasserver/tests/test_node_action.py

src/maasserver/tests/test_plugin.py

src/maasserver/tests/test_preseed_storage.py

src/maasserver/tests/test_system_controller.py

src/maasserver/triggers/system.py

src/maasserver/triggers/tests/test_system_listener.py

src/maasserver/views/combo.py

src/maasserver/websockets/handlers/controller.py

src/maasserver/websockets/handlers/general.py

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

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

src/maasserver/websockets/tests/test_protocol.py

src/metadataserver/api.py

Older »