← Back to branch summary

~mpontillo/maas/js-metrics-service

~mpontillo/maas/js-metrics-service

Viewing all changes in revision 5959.

Committer: Mike Pontillo
Date: 2017-04-13 20:57:18 UTC
mfrom: (5957.1.20 maas)
Revision ID: mike.pontillo@canonical.com-20170413205718-nnit08fatft7sth8

Merge trunk.

files added:
src/maasserver/api/scriptresults.py

src/maasserver/api/tests/test_scriptresults.py

files modified:
contrib/preseeds_v2/enlist_userdata

snap/plugins/bzr_version.py

snap/snapcraft.yaml

src/maasserver/api/machines.py

src/maasserver/api/nodes.py

src/maasserver/api/rackcontrollers.py

src/maasserver/api/regioncontrollers.py

src/maasserver/api/scripts.py

src/maasserver/api/tests/test_enlistment.py

src/maasserver/api/tests/test_machines.py

src/maasserver/api/tests/test_nodes.py

src/maasserver/api/tests/test_rackcontroller.py

src/maasserver/api/tests/test_regioncontroller.py

src/maasserver/api/tests/test_scripts.py

src/maasserver/eventloop.py

src/maasserver/forms/script.py

src/maasserver/forms/tests/test_script.py

src/maasserver/node_constraint_filter_forms.py

src/maasserver/regiondservices/service_monitor_service.py

src/maasserver/rpc/regionservice.py

src/maasserver/rpc/tests/test_regionservice.py

src/maasserver/static/css/build.css

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

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

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

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

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

src/maasserver/static/partials/ipranges.html

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

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

src/maasserver/static/partials/settings.html

src/maasserver/static/scss/_pages.scratch.scss

src/maasserver/status_monitor.py

src/maasserver/testing/factory.py

src/maasserver/tests/test_eventloop.py

src/maasserver/tests/test_node_constraint_filter_forms.py

src/maasserver/tests/test_status_monitor.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/websockets/handlers/machine.py

src/maasserver/websockets/handlers/node.py

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

src/metadataserver/api.py

src/metadataserver/enum.py

src/metadataserver/models/script.py

src/metadataserver/models/scriptresult.py

src/metadataserver/models/scriptset.py

src/metadataserver/models/tests/test_scriptresult.py

src/metadataserver/models/tests/test_scriptset.py

src/metadataserver/tests/test_api.py

src/metadataserver/user_data/templates/snippets/maas_enlist.sh

src/metadataserver/user_data/templates/snippets/maas_run_remote_scripts.py

src/metadataserver/user_data/templates/snippets/tests/test_maas_run_remote_scripts.py

src/provisioningserver/drivers/osystem/tests/test_ubuntucore.py

src/provisioningserver/drivers/osystem/ubuntucore.py

src/provisioningserver/kernel_opts.py

src/provisioningserver/refresh/__init__.py

src/provisioningserver/refresh/maas_api_helper.py

src/provisioningserver/refresh/tests/test_maas_api_helper.py

src/provisioningserver/refresh/tests/test_refresh.py

src/provisioningserver/rpc/clusterservice.py

src/provisioningserver/tests/test_kernel_opts.py

Show diffs side-by-side

added added

removed removed

contrib/preseeds_v2/enlist_userdata

snap/plugins/bzr_version.py

snap/snapcraft.yaml

src/maasserver/api/machines.py

src/maasserver/api/nodes.py

src/maasserver/api/rackcontrollers.py

src/maasserver/api/regioncontrollers.py

src/maasserver/api/scriptresults.py

src/maasserver/api/scripts.py

src/maasserver/api/tests/test_enlistment.py

src/maasserver/api/tests/test_machines.py

src/maasserver/api/tests/test_nodes.py

src/maasserver/api/tests/test_rackcontroller.py

src/maasserver/api/tests/test_regioncontroller.py

src/maasserver/api/tests/test_scriptresults.py

src/maasserver/api/tests/test_scripts.py

src/maasserver/eventloop.py

src/maasserver/forms/script.py

src/maasserver/forms/tests/test_script.py

src/maasserver/node_constraint_filter_forms.py

src/maasserver/regiondservices/service_monitor_service.py

src/maasserver/rpc/regionservice.py

src/maasserver/rpc/tests/test_regionservice.py

src/maasserver/static/css/build.css

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

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

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

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

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

src/maasserver/static/partials/ipranges.html

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

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

src/maasserver/static/partials/settings.html

src/maasserver/static/scss/_pages.scratch.scss

src/maasserver/status_monitor.py

src/maasserver/testing/factory.py

src/maasserver/tests/test_eventloop.py

src/maasserver/tests/test_node_constraint_filter_forms.py

src/maasserver/tests/test_status_monitor.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/websockets/handlers/machine.py

src/maasserver/websockets/handlers/node.py

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

src/metadataserver/api.py

src/metadataserver/enum.py

src/metadataserver/models/script.py

src/metadataserver/models/scriptresult.py

src/metadataserver/models/scriptset.py

src/metadataserver/models/tests/test_scriptresult.py

src/metadataserver/models/tests/test_scriptset.py

src/metadataserver/tests/test_api.py

src/metadataserver/user_data/templates/snippets/maas_enlist.sh

src/metadataserver/user_data/templates/snippets/maas_run_remote_scripts.py

src/metadataserver/user_data/templates/snippets/tests/test_maas_run_remote_scripts.py

src/provisioningserver/drivers/osystem/tests/test_ubuntucore.py

src/provisioningserver/drivers/osystem/ubuntucore.py

src/provisioningserver/kernel_opts.py

src/provisioningserver/refresh/__init__.py

src/provisioningserver/refresh/maas_api_helper.py

src/provisioningserver/refresh/tests/test_maas_api_helper.py

src/provisioningserver/refresh/tests/test_refresh.py

src/provisioningserver/rpc/clusterservice.py

src/provisioningserver/tests/test_kernel_opts.py

Older »