← Back to branch summary

~mpontillo/maas/networks-list-view

~mpontillo/maas/networks-list-view

Viewing all changes in revision 5658.

Committer: Mike Pontillo
Date: 2017-01-26 02:45:44 UTC
mfrom: (5655.1.13 maas)
Revision ID: mike.pontillo@canonical.com-20170126024544-f4kkvs8wwx3oumsw

Merge trunk.

src/maasserver/migrations/builtin/maasserver/0106_testing_status.py

src/maasserver/migrations/builtin/maasserver/0107_chassis_to_pods.py

src/metadataserver/migrations/builtin/0003_remove_noderesult.py

src/provisioningserver/templates/commissioning-user-data/snippets/maas_api_helper.py

src/provisioningserver/templates/commissioning-user-data/snippets/maas_run_remote_scripts.py

src/provisioningserver/templates/commissioning-user-data/snippets/tests/test_maas_run_remote_scripts.py

files removed:
src/maasserver/api/storage.py

src/maasserver/api/tests/test_storage.py

src/metadataserver/models/noderesult.py

src/metadataserver/models/tests/test_nodecommissionresult.py

src/provisioningserver/templates/commissioning-user-data/snippets/maas_api_helper.py

src/provisioningserver/templates/commissioning-user-data/snippets/maas_get.py

files renamed:
templates/ntp.conf => run/etc/ntp.conf

src/maasserver/api/chassis.py => src/maasserver/api/pods.py

src/maasserver/api/tests/test_chassis.py => src/maasserver/api/tests/test_pods.py

src/maasserver/clusterrpc/chassis.py => src/maasserver/clusterrpc/pods.py

src/maasserver/clusterrpc/tests/test_chassis.py => src/maasserver/clusterrpc/tests/test_pods.py

src/maasserver/models/chassishints.py => src/maasserver/models/podhints.py

src/maasserver/tests/test_forms_chassis.py => src/maasserver/tests/test_forms_pods.py

src/provisioningserver/drivers/chassis/ => src/provisioningserver/drivers/pod/

src/provisioningserver/rpc/chassis.py => src/provisioningserver/rpc/pods.py

src/provisioningserver/rpc/tests/test_chassis.py => src/provisioningserver/rpc/tests/test_pods.py

files modified:
Makefile

media/README

required-packages/forbidden

src/maasserver/api/doc.py

src/maasserver/api/doc_handler.py

src/maasserver/api/nodes.py

src/maasserver/api/results.py

src/maasserver/api/tests/test_commissioning.py

src/maasserver/api/tests/test_discoveries.py

src/maasserver/api/tests/test_doc.py

src/maasserver/api/tests/test_node.py

src/maasserver/api/tests/test_packagerepositories.py

src/maasserver/api/tests/test_tag.py

src/maasserver/clusterrpc/driver_parameters.py

src/maasserver/clusterrpc/testing/driver_parameters.py

src/maasserver/clusterrpc/tests/test_driver_parameters.py

src/maasserver/dbviews.py

src/maasserver/djangosettings/development.py

src/maasserver/enum.py

src/maasserver/exceptions.py

src/maasserver/forms.py

src/maasserver/forms_subnet.py

src/maasserver/models/__init__.py

src/maasserver/models/bmc.py

src/maasserver/models/node.py

src/maasserver/models/nodeprobeddetails.py

src/maasserver/models/signals/bmc.py

src/maasserver/models/signals/nodes.py

src/maasserver/models/signals/tests/test_bmc.py

src/maasserver/models/signals/tests/test_nodes.py

src/maasserver/models/tests/test_bmc.py

src/maasserver/models/tests/test_node.py

src/maasserver/models/tests/test_nodeprobeddetails.py

src/maasserver/node_action.py

src/maasserver/node_status.py

src/maasserver/populate_tags.py

src/maasserver/preseed.py

src/maasserver/regiondservices/tests/test_ntp.py

src/maasserver/rpc/rackcontrollers.py

src/maasserver/rpc/tests/test_rackcontrollers.py

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

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

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

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

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

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

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

src/maasserver/static/js/angular/filters/by_space.js

src/maasserver/static/js/angular/filters/by_vlan.js

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

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

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

src/maasserver/testing/factory.py

src/maasserver/testing/initial.maas_test.sql

src/maasserver/testing/resources.py

src/maasserver/testing/sampledata.py

src/maasserver/tests/test_node_action.py

src/maasserver/tests/test_populate_tags.py

src/maasserver/tests/test_third_party_drivers.py

src/maasserver/third_party_drivers.py

src/maasserver/triggers/testing.py

src/maasserver/triggers/tests/test_init.py

src/maasserver/triggers/tests/test_websocket_listener.py

src/maasserver/triggers/websocket.py

src/maasserver/urls_api.py

src/maasserver/utils/tests/test_dblocks.py

src/maasserver/utils/tests/test_dbtasks.py

src/maasserver/websockets/handlers/device.py

src/maasserver/websockets/handlers/node.py

src/maasserver/websockets/handlers/subnet.py

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

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

src/maasserver/websockets/tests/test_protocol.py

src/maastesting/fixtures.py

src/maastesting/testcase.py

src/maastesting/tests/test_conflict_markers.py

src/maastesting/tests/test_fixtures.py

src/metadataserver/api.py

src/metadataserver/enum.py

src/metadataserver/models/__init__.py

src/metadataserver/models/commissioningscript.py

src/metadataserver/models/scriptresult.py

src/metadataserver/models/scriptset.py

src/metadataserver/models/tests/test_commissioningscript.py

src/metadataserver/models/tests/test_scriptresult.py

src/metadataserver/models/tests/test_scriptset.py

src/metadataserver/tests/test_api.py

src/metadataserver/tests/test_api_status.py

src/metadataserver/urls.py

src/metadataserver/user_data/tests/test_commissioning.py

src/provisioningserver/dhcp/__init__.py

src/provisioningserver/drivers/pod/__init__.py

src/provisioningserver/drivers/pod/null.py

src/provisioningserver/drivers/pod/registry.py

src/provisioningserver/drivers/pod/tests/test_base.py

src/provisioningserver/drivers/pod/tests/test_registry.py

src/provisioningserver/drivers/power/registry.py

src/provisioningserver/drivers/power/tests/test_registry.py

src/provisioningserver/refresh/__init__.py

src/provisioningserver/refresh/maas_api_helper.py

src/provisioningserver/refresh/node_info_scripts.py

src/provisioningserver/refresh/tests/test_maas_api_helper.py

src/provisioningserver/refresh/tests/test_refresh.py

src/provisioningserver/rpc/arguments.py

src/provisioningserver/rpc/cluster.py

src/provisioningserver/rpc/clusterservice.py

src/provisioningserver/rpc/exceptions.py

src/provisioningserver/rpc/tests/test_arguments.py

src/provisioningserver/rpc/tests/test_clusterservice.py

src/provisioningserver/templates/commissioning-user-data/snippets/maas_signal.py

src/provisioningserver/templates/commissioning-user-data/user_data.template

src/provisioningserver/tests/test_config.py

src/provisioningserver/utils/fs.py

src/provisioningserver/utils/tests/test_fs.py

src/provisioningserver/utils/tests/test_utils.py

Show diffs side-by-side

added added

removed removed

required-packages/forbidden

src/maasserver/api/doc.py

src/maasserver/api/doc_handler.py

src/maasserver/api/nodes.py

src/maasserver/api/pods.py

src/maasserver/api/results.py

src/maasserver/api/storage.py

src/maasserver/api/tests/test_commissioning.py

src/maasserver/api/tests/test_discoveries.py

src/maasserver/api/tests/test_doc.py

src/maasserver/api/tests/test_node.py

src/maasserver/api/tests/test_packagerepositories.py

src/maasserver/api/tests/test_pods.py

src/maasserver/api/tests/test_storage.py

src/maasserver/api/tests/test_tag.py

src/maasserver/clusterrpc/driver_parameters.py

src/maasserver/clusterrpc/pods.py

src/maasserver/clusterrpc/testing/driver_parameters.py

src/maasserver/clusterrpc/tests/test_driver_parameters.py

src/maasserver/clusterrpc/tests/test_pods.py

src/maasserver/dbviews.py

src/maasserver/djangosettings/development.py

src/maasserver/enum.py

src/maasserver/exceptions.py

src/maasserver/forms.py

src/maasserver/forms_subnet.py

src/maasserver/migrations/builtin/maasserver/0105_add_script_sets_to_node_model.py

src/maasserver/migrations/builtin/maasserver/0106_testing_status.py

src/maasserver/migrations/builtin/maasserver/0107_chassis_to_pods.py

src/maasserver/models/__init__.py

src/maasserver/models/bmc.py

src/maasserver/models/node.py

src/maasserver/models/nodeprobeddetails.py

src/maasserver/models/podhints.py

src/maasserver/models/signals/bmc.py

src/maasserver/models/signals/nodes.py

src/maasserver/models/signals/tests/test_bmc.py

src/maasserver/models/signals/tests/test_nodes.py

src/maasserver/models/tests/test_bmc.py

src/maasserver/models/tests/test_node.py

src/maasserver/models/tests/test_nodeprobeddetails.py

src/maasserver/node_action.py

src/maasserver/node_status.py

src/maasserver/populate_tags.py

src/maasserver/preseed.py

src/maasserver/regiondservices/tests/test_ntp.py

src/maasserver/rpc/rackcontrollers.py

src/maasserver/rpc/tests/test_rackcontrollers.py

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

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

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

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

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

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

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

src/maasserver/static/js/angular/filters/by_space.js

src/maasserver/static/js/angular/filters/by_vlan.js

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

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

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

src/maasserver/testing/factory.py

src/maasserver/testing/initial.maas_test.sql

src/maasserver/testing/resources.py

src/maasserver/testing/sampledata.py

src/maasserver/tests/test_forms_pods.py

src/maasserver/tests/test_node_action.py

src/maasserver/tests/test_populate_tags.py

src/maasserver/tests/test_third_party_drivers.py

src/maasserver/third_party_drivers.py

src/maasserver/triggers/testing.py

src/maasserver/triggers/tests/test_init.py

src/maasserver/triggers/tests/test_websocket_listener.py

src/maasserver/triggers/websocket.py

src/maasserver/urls_api.py

src/maasserver/utils/tests/test_dblocks.py

src/maasserver/utils/tests/test_dbtasks.py

src/maasserver/websockets/handlers/device.py

src/maasserver/websockets/handlers/node.py

src/maasserver/websockets/handlers/subnet.py

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

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

src/maasserver/websockets/tests/test_protocol.py

src/maastesting/fixtures.py

src/maastesting/testcase.py

src/maastesting/tests/test_conflict_markers.py

src/maastesting/tests/test_fixtures.py

src/metadataserver/api.py

src/metadataserver/enum.py

src/metadataserver/migrations/builtin/0003_remove_noderesult.py

src/metadataserver/models/__init__.py

src/metadataserver/models/commissioningscript.py

src/metadataserver/models/noderesult.py

src/metadataserver/models/scriptresult.py

src/metadataserver/models/scriptset.py

src/metadataserver/models/tests/test_commissioningscript.py

src/metadataserver/models/tests/test_nodecommissionresult.py

src/metadataserver/models/tests/test_scriptresult.py

src/metadataserver/models/tests/test_scriptset.py

src/metadataserver/tests/test_api.py

src/metadataserver/tests/test_api_status.py

src/metadataserver/urls.py

src/metadataserver/user_data/tests/test_commissioning.py

src/provisioningserver/dhcp/__init__.py

src/provisioningserver/drivers/pod/__init__.py

src/provisioningserver/drivers/pod/null.py

src/provisioningserver/drivers/pod/registry.py

src/provisioningserver/drivers/pod/tests/test_base.py

src/provisioningserver/drivers/pod/tests/test_registry.py

src/provisioningserver/drivers/power/registry.py

src/provisioningserver/drivers/power/tests/test_registry.py

src/provisioningserver/refresh/__init__.py

src/provisioningserver/refresh/maas_api_helper.py

src/provisioningserver/refresh/node_info_scripts.py

src/provisioningserver/refresh/tests/test_maas_api_helper.py

src/provisioningserver/refresh/tests/test_refresh.py

src/provisioningserver/rpc/arguments.py

src/provisioningserver/rpc/cluster.py

src/provisioningserver/rpc/clusterservice.py

src/provisioningserver/rpc/exceptions.py

src/provisioningserver/rpc/pods.py

src/provisioningserver/rpc/tests/test_arguments.py

src/provisioningserver/rpc/tests/test_clusterservice.py

src/provisioningserver/rpc/tests/test_pods.py

src/provisioningserver/templates/commissioning-user-data/snippets/maas_api_helper.py

src/provisioningserver/templates/commissioning-user-data/snippets/maas_api_helper.py@

src/provisioningserver/templates/commissioning-user-data/snippets/maas_get.py

src/provisioningserver/templates/commissioning-user-data/snippets/maas_run_remote_scripts.py

src/provisioningserver/templates/commissioning-user-data/snippets/maas_signal.py

src/provisioningserver/templates/commissioning-user-data/snippets/tests/test_maas_run_remote_scripts.py

src/provisioningserver/templates/commissioning-user-data/user_data.template

src/provisioningserver/tests/test_config.py

src/provisioningserver/utils/fs.py

src/provisioningserver/utils/tests/test_fs.py

src/provisioningserver/utils/tests/test_utils.py

Older »