← Back to branch summary

~mpontillo/maas/networks-list-view

~mpontillo/maas/networks-list-view

Viewing all changes in revision 5637.2.6.

Committer: Gavin Panella
Date: 2017-01-20 11:30:38 UTC
mfrom: (5637.1.10 nose-select-bucket-plugin)
mto: This revision was merged to the branch mainline in revision 5648.
Revision ID: gavin.panella@canonical.com-20170120113038-0jbmdw8f9sg3pxfc

Merged nose-select-bucket-plugin into test-in-parallel, resolving a minor conflict.

files added:
src/maasserver/static/css/build.css.moved

src/maasserver/static/js/angular/3rdparty/sticky.min.js

src/maasserver/static/scss/_patterns.footer.scss

src/provisioningserver/refresh/tests/__init__.py

files modified:
Makefile

buildout.cfg

src/maasserver/api/spaces.py

src/maasserver/api/tests/test_boot_resources.py

src/maasserver/api/tests/test_boot_source_selections.py

src/maasserver/api/tests/test_enlistment.py

src/maasserver/api/tests/test_licensekey.py

src/maasserver/api/tests/test_machines.py

src/maasserver/api/tests/test_packagerepositories.py

src/maasserver/api/tests/test_rackcontroller.py

src/maasserver/api/tests/test_spaces.py

src/maasserver/api/tests/test_utils.py

src/maasserver/api/tests/test_volume_groups.py

src/maasserver/clusterrpc/testing/driver_parameters.py

src/maasserver/dns/tests/test_zonegenerator.py

src/maasserver/models/tests/test_dnsdata.py

src/maasserver/models/tests/test_interface.py

src/maasserver/models/tests/test_staticipaddress.py

src/maasserver/rpc/tests/test_nodes.py

src/maasserver/static/css/build.css

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

src/maasserver/static/partials/boot-images.html

src/maasserver/static/partials/dashboard.html

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

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

src/maasserver/static/partials/error.html

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

src/maasserver/static/partials/ipranges.html

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

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

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

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

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

src/maasserver/static/partials/settings.html

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

src/maasserver/static/partials/ssh-keys.html

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

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

src/maasserver/static/scss/_base.definition-list.scss

src/maasserver/static/scss/_base.forms.scss

src/maasserver/static/scss/_base.typography.scss

src/maasserver/static/scss/_components.buttons.scss

src/maasserver/static/scss/_components.forms.scss

src/maasserver/static/scss/_components.tables.scss

src/maasserver/static/scss/_components.tabs.scss

src/maasserver/static/scss/_components.tooltips.scss

src/maasserver/static/scss/_helpers.display.scss

src/maasserver/static/scss/_helpers.spacing.scss

src/maasserver/static/scss/_layout.wrapper.scss

src/maasserver/static/scss/_patterns.accordion.scss

src/maasserver/static/scss/_patterns.header.scss

src/maasserver/static/scss/_patterns.page-header.scss

src/maasserver/static/scss/_settings.defaults.scss

src/maasserver/static/scss/build.scss

src/maasserver/templates/maasserver/base.html

src/maasserver/templates/maasserver/index.html

src/maasserver/templates/maasserver/logout_confirm.html

src/maasserver/templates/maasserver/settings.html

src/maasserver/templates/maasserver/zone_list.html

src/maasserver/templates/registration/login.html

src/maasserver/tests/test_forms_config.py

src/maasserver/tests/test_forms_settings.py

src/maasserver/tests/test_forms_ubuntu.py

src/maasserver/tests/test_node_action.py

src/maasserver/tests/test_node_constraint_filter_forms.py

src/maasserver/tests/test_plugin.py

src/maasserver/tests/test_preseed.py

src/maasserver/tests/test_service_monitor.py

src/maasserver/tests/test_storage_layouts.py

src/maasserver/tests/test_third_party_drivers.py

src/maasserver/tests/test_x509.py

src/maasserver/utils/tests/test_osystems.py

src/maasserver/websockets/handlers/general.py

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

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

src/maastesting/noseplug.py

src/maastesting/testcase.py

src/maastesting/tests/test_testcase.py

src/metadataserver/models/tests/test_scriptresult.py

src/metadataserver/user_data/tests/test_snippets.py

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

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

src/provisioningserver/drivers/tests/test_base.py

src/provisioningserver/import_images/boot_resources.py

src/provisioningserver/import_images/download_resources.py

src/provisioningserver/import_images/tests/test_boot_resources.py

src/provisioningserver/import_images/tests/test_download_resources.py

src/provisioningserver/refresh/tests/test_maas_api_helper.py

src/provisioningserver/rpc/tests/test_clusterservice.py

src/provisioningserver/tests/test_events.py

src/provisioningserver/tests/test_plugin.py

src/provisioningserver/tests/test_service_monitor.py

src/provisioningserver/utils/tests/test_enum.py

versions.cfg

Show diffs side-by-side

added added

removed removed

src/maasserver/api/spaces.py

src/maasserver/api/tests/test_boot_resources.py

src/maasserver/api/tests/test_boot_source_selections.py

src/maasserver/api/tests/test_enlistment.py

src/maasserver/api/tests/test_licensekey.py

src/maasserver/api/tests/test_machines.py

src/maasserver/api/tests/test_packagerepositories.py

src/maasserver/api/tests/test_rackcontroller.py

src/maasserver/api/tests/test_spaces.py

src/maasserver/api/tests/test_utils.py

src/maasserver/api/tests/test_volume_groups.py

src/maasserver/clusterrpc/testing/driver_parameters.py

src/maasserver/dns/tests/test_zonegenerator.py

src/maasserver/models/tests/test_dnsdata.py

src/maasserver/models/tests/test_interface.py

src/maasserver/models/tests/test_staticipaddress.py

src/maasserver/rpc/tests/test_nodes.py

src/maasserver/static/css/build.css

src/maasserver/static/css/build.css.moved

src/maasserver/static/js/angular/3rdparty/sticky.min.js

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

src/maasserver/static/partials/boot-images.html

src/maasserver/static/partials/dashboard.html

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

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

src/maasserver/static/partials/error.html

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

src/maasserver/static/partials/ipranges.html

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

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

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

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

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

src/maasserver/static/partials/settings.html

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

src/maasserver/static/partials/ssh-keys.html

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

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

src/maasserver/static/scss/_base.definition-list.scss

src/maasserver/static/scss/_base.forms.scss

src/maasserver/static/scss/_base.typography.scss

src/maasserver/static/scss/_components.buttons.scss

src/maasserver/static/scss/_components.forms.scss

src/maasserver/static/scss/_components.tables.scss

src/maasserver/static/scss/_components.tabs.scss

src/maasserver/static/scss/_components.tooltips.scss

src/maasserver/static/scss/_helpers.display.scss

src/maasserver/static/scss/_helpers.spacing.scss

src/maasserver/static/scss/_layout.wrapper.scss

src/maasserver/static/scss/_patterns.accordion.scss

src/maasserver/static/scss/_settings.defaults.scss

src/maasserver/static/scss/build.scss

src/maasserver/templates/maasserver/base.html

src/maasserver/templates/maasserver/index.html

src/maasserver/templates/maasserver/logout_confirm.html

src/maasserver/templates/maasserver/settings.html

src/maasserver/templates/maasserver/zone_list.html

src/maasserver/tests/test_forms_config.py

src/maasserver/tests/test_forms_settings.py

src/maasserver/tests/test_forms_ubuntu.py

src/maasserver/tests/test_node_action.py

src/maasserver/tests/test_node_constraint_filter_forms.py

src/maasserver/tests/test_plugin.py

src/maasserver/tests/test_preseed.py

src/maasserver/tests/test_service_monitor.py

src/maasserver/tests/test_storage_layouts.py

src/maasserver/tests/test_third_party_drivers.py

src/maasserver/tests/test_x509.py

src/maasserver/utils/tests/test_osystems.py

src/maasserver/websockets/handlers/general.py

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

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

src/maastesting/noseplug.py

src/maastesting/testcase.py

src/maastesting/tests/test_testcase.py

src/metadataserver/models/tests/test_scriptresult.py

src/metadataserver/user_data/tests/test_snippets.py

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

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

src/provisioningserver/drivers/tests/test_base.py

src/provisioningserver/import_images/boot_resources.py

src/provisioningserver/import_images/download_resources.py

src/provisioningserver/import_images/tests/test_boot_resources.py

src/provisioningserver/import_images/tests/test_download_resources.py

src/provisioningserver/refresh/tests/__init__.py

src/provisioningserver/refresh/tests/test_maas_api_helper.py

src/provisioningserver/rpc/tests/test_clusterservice.py

src/provisioningserver/tests/test_events.py

src/provisioningserver/tests/test_plugin.py

src/provisioningserver/tests/test_service_monitor.py

src/provisioningserver/utils/tests/test_enum.py

Older »