← Back to branch summary

~ltrager/maas/script_models

~ltrager/maas/script_models

Viewing all changes in revision 5582.

Committer: Lee Trager
Date: 2016-12-21 01:34:09 UTC
mfrom: (5579.2.35 maas)
Revision ID: lee.trager@canonical.com-20161221013409-ailqwacuk1zk8lmp

Merge trunk

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

src/maasserver/api/storage.py

src/maasserver/api/tests/test_chassis.py

src/maasserver/api/tests/test_storage.py

src/maasserver/clusterrpc/chassis.py

src/maasserver/clusterrpc/tests/test_chassis.py

src/maasserver/migrations/builtin/maasserver/0094_add_unmanaged_subnets.py

src/maasserver/migrations/builtin/maasserver/0095_vlan_relay_vlan.py

src/maasserver/migrations/builtin/maasserver/0096_set_default_vlan_field.py

src/maasserver/migrations/builtin/maasserver/0097_node_chassis_storage_hints.py

src/maasserver/migrations/builtin/maasserver/0098_add_space_to_vlan.py

src/maasserver/migrations/builtin/maasserver/0099_set_default_vlan_field.py

src/maasserver/migrations/builtin/maasserver/0100_migrate_spaces_from_subnet_to_vlan.py

src/maasserver/migrations/builtin/maasserver/0101_filesystem_btrfs_support.py

src/maasserver/migrations/builtin/maasserver/0102_script_models.py

src/maasserver/migrations/builtin/maasserver/0103_script_models.py

src/maasserver/models/chassishints.py

src/maasserver/static/css/build.css

src/maasserver/static/scss/_components.notifications.scss

src/metadataserver/migrations/builtin/0002_script_models.py

src/provisioningserver/drivers/chassis/null.py

src/provisioningserver/rackdservices/tftp_offload.py

src/provisioningserver/rpc/chassis.py

src/provisioningserver/rpc/tests/test_chassis.py

files removed:
src/maasserver/migrations/builtin/maasserver/0094_script_models.py

src/maasserver/migrations/builtin/maasserver/0095_script_models.py

src/maasserver/static/css/build.css

src/maasserver/static/scss/_components.flashmessages.scss

src/metadataserver/migrations/builtin/0002_script_models.py

files renamed:
src/maasserver/clusterrpc/power_parameters.py => src/maasserver/clusterrpc/driver_parameters.py

src/maasserver/clusterrpc/testing/power_parameters.py => src/maasserver/clusterrpc/testing/driver_parameters.py

src/maasserver/clusterrpc/tests/test_power_parameters.py => src/maasserver/clusterrpc/tests/test_driver_parameters.py

src/maas/ => src/maasserver/djangosettings/

src/maas/tests/test_maas.py => src/maasserver/djangosettings/tests/test_settings.py

files modified:
HACKING.txt

Makefile

buildout.cfg

contrib/preseeds_v2/curtin_userdata

contrib/preseeds_v2/curtin_userdata_centos

contrib/preseeds_v2/curtin_userdata_custom

contrib/preseeds_v2/curtin_userdata_suse

contrib/preseeds_v2/curtin_userdata_windows

docs/_templates/maas/static/css/main.css

docs/conf.py

docs/troubleshooting.rst

media/README

services/reloader/run

src/maascli/cli.py

src/maasserver/__init__.py

src/maasserver/api/bcache.py

src/maasserver/api/bcache_cacheset.py

src/maasserver/api/blockdevices.py

src/maasserver/api/boot_resources.py

src/maasserver/api/boot_source_selections.py

src/maasserver/api/dhcpsnippets.py

src/maasserver/api/dnsresourcerecords.py

src/maasserver/api/dnsresources.py

src/maasserver/api/domains.py

src/maasserver/api/fabrics.py

src/maasserver/api/fannetworks.py

src/maasserver/api/interfaces.py

src/maasserver/api/ipranges.py

src/maasserver/api/machines.py

src/maasserver/api/nodes.py

src/maasserver/api/packagerepositories.py

src/maasserver/api/partitions.py

src/maasserver/api/rackcontrollers.py

src/maasserver/api/raid.py

src/maasserver/api/spaces.py

src/maasserver/api/ssh_keys.py

src/maasserver/api/ssl_keys.py

src/maasserver/api/staticroutes.py

src/maasserver/api/subnets.py

src/maasserver/api/support.py

src/maasserver/api/tests/test_api.py

src/maasserver/api/tests/test_bcache.py

src/maasserver/api/tests/test_bcache_cacheset.py

src/maasserver/api/tests/test_blockdevice.py

src/maasserver/api/tests/test_boot_resources.py

src/maasserver/api/tests/test_dhcpsnippets.py

src/maasserver/api/tests/test_interfaces.py

src/maasserver/api/tests/test_nodes.py

src/maasserver/api/tests/test_partitions.py

src/maasserver/api/tests/test_rackcontroller.py

src/maasserver/api/tests/test_raid.py

src/maasserver/api/tests/test_subnets.py

src/maasserver/api/tests/test_user.py

src/maasserver/api/tests/test_vlans.py

src/maasserver/api/tests/test_volume_groups.py

src/maasserver/api/users.py

src/maasserver/api/vlans.py

src/maasserver/api/volume_groups.py

src/maasserver/compose_preseed.py

src/maasserver/dhcp.py

src/maasserver/djangosettings/demo.py

src/maasserver/djangosettings/development.py

src/maasserver/djangosettings/settings.py

src/maasserver/enum.py

src/maasserver/eventloop.py

src/maasserver/exceptions.py

src/maasserver/forms.py

src/maasserver/forms_subnet.py

src/maasserver/forms_vlan.py

src/maasserver/management/commands/dbupgrade.py

src/maasserver/management/commands/tests/test_dbupgrade.py

src/maasserver/migrations/builtin/maasserver/0027_replace_static_range_with_admin_reserved_ranges.py

src/maasserver/migrations/builtin/maasserver/0056_add_description_to_fabric_and_space.py

src/maasserver/migrations/south/django16_south_maas19.tar.gz

src/maasserver/models/__init__.py

src/maasserver/models/interface.py

src/maasserver/models/node.py

src/maasserver/models/signals/nodes.py

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

src/maasserver/models/subnet.py

src/maasserver/models/tests/test_discovery.py

src/maasserver/models/tests/test_interface.py

src/maasserver/models/tests/test_neighbour.py

src/maasserver/models/tests/test_node.py

src/maasserver/models/tests/test_staticipaddress.py

src/maasserver/models/tests/test_subnet.py

src/maasserver/models/tests/test_vlan.py

src/maasserver/models/vlan.py

src/maasserver/node_constraint_filter_forms.py

src/maasserver/plugin.py

src/maasserver/preseed.py

src/maasserver/rpc/tests/test_nodes.py

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

src/maasserver/static/js/angular/controllers/tests/test_subnet_details.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/factories/tests/test_vlans.js

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

src/maasserver/static/partials/dashboard.html

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

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

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

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

src/maasserver/static/scss/_base.main.scss

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

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

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

src/maasserver/static/scss/_helpers.mixins.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/testing/factory.py

src/maasserver/testing/testcase.py

src/maasserver/tests/test_compose_preseed.py

src/maasserver/tests/test_dhcp.py

src/maasserver/tests/test_forms_controller.py

src/maasserver/tests/test_forms_machine.py

src/maasserver/tests/test_forms_vlan.py

src/maasserver/tests/test_node_constraint_filter_forms.py

src/maasserver/tests/test_preseed.py

src/maasserver/triggers/system.py

src/maasserver/triggers/tests/test_system_listener.py

src/maasserver/triggers/tests/test_websocket_listener.py

src/maasserver/triggers/websocket.py

src/maasserver/urls_api.py

src/maasserver/utils/tests/test_mac.py

src/maasserver/websockets/handlers/device.py

src/maasserver/websockets/handlers/general.py

src/maasserver/websockets/handlers/machine.py

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

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

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

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

src/maasserver/websockets/handlers/vlan.py

src/maastesting/matchers.py

src/maastesting/tests/test_matchers.py

src/maastesting/typecheck.py

src/metadataserver/api.py

src/metadataserver/tests/test_api.py

src/provisioningserver/boot/__init__.py

src/provisioningserver/drivers/__init__.py

src/provisioningserver/drivers/chassis/__init__.py

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

src/provisioningserver/drivers/hardware/tests/test_ucsm.py

src/provisioningserver/drivers/hardware/ucsm.py

src/provisioningserver/drivers/power/__init__.py

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

src/provisioningserver/import_images/keyrings.py

src/provisioningserver/import_images/tests/test_keyrings.py

src/provisioningserver/kernel_opts.py

src/provisioningserver/plugin.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/tests/test_kernel_opts.py

src/provisioningserver/tests/test_plugin.py

src/provisioningserver/utils/network.py

src/provisioningserver/utils/tests/test_network.py

utilities/check-imports

utilities/remote-reinstall

Show diffs side-by-side

added added

removed removed

contrib/preseeds_v2/curtin_userdata

contrib/preseeds_v2/curtin_userdata_centos

contrib/preseeds_v2/curtin_userdata_custom

contrib/preseeds_v2/curtin_userdata_suse

contrib/preseeds_v2/curtin_userdata_windows

docs/_templates/maas/static/css/main.css

docs/troubleshooting.rst

services/reloader/run

src/maascli/cli.py

src/maasserver/__init__.py

src/maasserver/api/bcache.py

src/maasserver/api/bcache_cacheset.py

src/maasserver/api/blockdevices.py

src/maasserver/api/boot_resources.py

src/maasserver/api/boot_source_selections.py

src/maasserver/api/chassis.py

src/maasserver/api/dhcpsnippets.py

src/maasserver/api/dnsresourcerecords.py

src/maasserver/api/dnsresources.py

src/maasserver/api/domains.py

src/maasserver/api/fabrics.py

src/maasserver/api/fannetworks.py

src/maasserver/api/interfaces.py

src/maasserver/api/ipranges.py

src/maasserver/api/machines.py

src/maasserver/api/nodes.py

src/maasserver/api/packagerepositories.py

src/maasserver/api/partitions.py

src/maasserver/api/rackcontrollers.py

src/maasserver/api/raid.py

src/maasserver/api/spaces.py

src/maasserver/api/ssh_keys.py

src/maasserver/api/ssl_keys.py

src/maasserver/api/staticroutes.py

src/maasserver/api/storage.py

src/maasserver/api/subnets.py

src/maasserver/api/support.py

src/maasserver/api/tests/test_api.py

src/maasserver/api/tests/test_bcache.py

src/maasserver/api/tests/test_bcache_cacheset.py

src/maasserver/api/tests/test_blockdevice.py

src/maasserver/api/tests/test_boot_resources.py

src/maasserver/api/tests/test_chassis.py

src/maasserver/api/tests/test_dhcpsnippets.py

src/maasserver/api/tests/test_interfaces.py

src/maasserver/api/tests/test_nodes.py

src/maasserver/api/tests/test_partitions.py

src/maasserver/api/tests/test_rackcontroller.py

src/maasserver/api/tests/test_raid.py

src/maasserver/api/tests/test_storage.py

src/maasserver/api/tests/test_subnets.py

src/maasserver/api/tests/test_user.py

src/maasserver/api/tests/test_vlans.py

src/maasserver/api/tests/test_volume_groups.py

src/maasserver/api/users.py

src/maasserver/api/vlans.py

src/maasserver/api/volume_groups.py

src/maasserver/clusterrpc/chassis.py

src/maasserver/clusterrpc/driver_parameters.py

src/maasserver/clusterrpc/testing/driver_parameters.py

src/maasserver/clusterrpc/tests/test_chassis.py

src/maasserver/clusterrpc/tests/test_driver_parameters.py

src/maasserver/compose_preseed.py

src/maasserver/dhcp.py

src/maasserver/djangosettings/demo.py

src/maasserver/djangosettings/development.py

src/maasserver/djangosettings/settings.py

src/maasserver/djangosettings/tests/test_settings.py

src/maasserver/enum.py

src/maasserver/eventloop.py

src/maasserver/exceptions.py

src/maasserver/forms.py

src/maasserver/forms_subnet.py

src/maasserver/forms_vlan.py

src/maasserver/management/commands/dbupgrade.py

src/maasserver/management/commands/tests/test_dbupgrade.py

src/maasserver/migrations/builtin/maasserver/0027_replace_static_range_with_admin_reserved_ranges.py

src/maasserver/migrations/builtin/maasserver/0056_add_description_to_fabric_and_space.py

src/maasserver/migrations/builtin/maasserver/0094_add_unmanaged_subnets.py

src/maasserver/migrations/builtin/maasserver/0094_script_models.py

src/maasserver/migrations/builtin/maasserver/0095_script_models.py

src/maasserver/migrations/builtin/maasserver/0095_vlan_relay_vlan.py

src/maasserver/migrations/builtin/maasserver/0096_set_default_vlan_field.py

src/maasserver/migrations/builtin/maasserver/0097_node_chassis_storage_hints.py

src/maasserver/migrations/builtin/maasserver/0098_add_space_to_vlan.py

src/maasserver/migrations/builtin/maasserver/0099_set_default_vlan_field.py

src/maasserver/migrations/builtin/maasserver/0100_migrate_spaces_from_subnet_to_vlan.py

src/maasserver/migrations/builtin/maasserver/0101_filesystem_btrfs_support.py

src/maasserver/migrations/builtin/maasserver/0102_script_models.py

src/maasserver/migrations/builtin/maasserver/0103_script_models.py

src/maasserver/migrations/south/django16_south_maas19.tar.gz

src/maasserver/models/__init__.py

src/maasserver/models/chassishints.py

src/maasserver/models/interface.py

src/maasserver/models/node.py

src/maasserver/models/signals/nodes.py

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

src/maasserver/models/subnet.py

src/maasserver/models/tests/test_discovery.py

src/maasserver/models/tests/test_interface.py

src/maasserver/models/tests/test_neighbour.py

src/maasserver/models/tests/test_node.py

src/maasserver/models/tests/test_staticipaddress.py

src/maasserver/models/tests/test_subnet.py

src/maasserver/models/tests/test_vlan.py

src/maasserver/models/vlan.py

src/maasserver/node_constraint_filter_forms.py

src/maasserver/plugin.py

src/maasserver/preseed.py

src/maasserver/rpc/tests/test_nodes.py

src/maasserver/static/css/build.css

src/maasserver/static/css/build.css

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

src/maasserver/static/js/angular/controllers/tests/test_subnet_details.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/factories/tests/test_vlans.js

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

src/maasserver/static/partials/dashboard.html

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

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

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

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

src/maasserver/static/scss/_base.main.scss

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

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

src/maasserver/static/scss/_components.flashmessages.scss

src/maasserver/static/scss/_components.notifications.scss

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

src/maasserver/static/scss/_helpers.mixins.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/testing/factory.py

src/maasserver/testing/testcase.py

src/maasserver/tests/test_compose_preseed.py

src/maasserver/tests/test_dhcp.py

src/maasserver/tests/test_forms_controller.py

src/maasserver/tests/test_forms_machine.py

src/maasserver/tests/test_forms_vlan.py

src/maasserver/tests/test_node_constraint_filter_forms.py

src/maasserver/tests/test_preseed.py

src/maasserver/triggers/system.py

src/maasserver/triggers/tests/test_system_listener.py

src/maasserver/triggers/tests/test_websocket_listener.py

src/maasserver/triggers/websocket.py

src/maasserver/urls_api.py

src/maasserver/utils/tests/test_mac.py

src/maasserver/websockets/handlers/device.py

src/maasserver/websockets/handlers/general.py

src/maasserver/websockets/handlers/machine.py

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

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

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

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

src/maasserver/websockets/handlers/vlan.py

src/maastesting/matchers.py

src/maastesting/tests/test_matchers.py

src/maastesting/typecheck.py

src/metadataserver/api.py

src/metadataserver/migrations/builtin/0002_script_models.py

src/metadataserver/migrations/builtin/0002_script_models.py

src/metadataserver/tests/test_api.py

src/provisioningserver/boot/__init__.py

src/provisioningserver/drivers/__init__.py

src/provisioningserver/drivers/chassis/__init__.py

src/provisioningserver/drivers/chassis/null.py

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

src/provisioningserver/drivers/hardware/tests/test_ucsm.py

src/provisioningserver/drivers/hardware/ucsm.py

src/provisioningserver/drivers/power/__init__.py

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

src/provisioningserver/import_images/keyrings.py

src/provisioningserver/import_images/tests/test_keyrings.py

src/provisioningserver/kernel_opts.py

src/provisioningserver/plugin.py

src/provisioningserver/rackdservices/tftp_offload.py

src/provisioningserver/rpc/arguments.py

src/provisioningserver/rpc/chassis.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_chassis.py

src/provisioningserver/rpc/tests/test_clusterservice.py

src/provisioningserver/tests/test_kernel_opts.py

src/provisioningserver/tests/test_plugin.py

src/provisioningserver/utils/network.py

src/provisioningserver/utils/tests/test_network.py

utilities/check-imports

utilities/remote-reinstall

Older »