← Back to branch summary

~blake-rouse/maas/fix-1353597-1.6

~blake-rouse/maas/fix-1353597-1.6

Viewing all changes in revision 2433.1.6.

Committer: Blake Rouse
Date: 2014-06-24 18:28:28 UTC
mfrom: (2464 maas)
mto: This revision was merged to the branch mainline in revision 2473.
Revision ID: blake.rouse@canonical.com-20140624182828-g6meiaajbtrugxgj

Merge trunk.

files added:
contrib/preseeds_v2/curtin_userdata_windows

contrib/preseeds_v2/preseed_master_windows_amd64_generic_win2012

contrib/preseeds_v2/preseed_master_windows_amd64_generic_win2012hv

contrib/preseeds_v2/preseed_master_windows_amd64_generic_win2012hvr2

contrib/preseeds_v2/preseed_master_windows_amd64_generic_win2012r2

etc/maas/templates/pxe/config.poweroff.template

etc/maas/templates/uefi/config.poweroff.template

etc/maas/templates/windows

src/maasserver/migrations/0085_add_user_to_staticipaddress.py

src/maasserver/rpc/bootsources.py

src/maasserver/rpc/tests/test_bootsources.py

src/maasserver/templates/maasserver/prefs_add_sslkey.html

src/maasserver/templates/maasserver/prefs_confirm_delete_sslkey.html

src/maasserver/testing/eventloop.py

src/maasserver/tests/test_api_ssl_key.py

src/provisioningserver/boot/tests/test_windows.py

src/provisioningserver/boot/windows.py

src/provisioningserver/drivers/hardware/mscm.py

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

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

src/provisioningserver/drivers/osystem/windows.py

files renamed:
src/maasserver/utils/network.py => src/provisioningserver/utils/network.py

src/maasserver/utils/tests/test_network.py => src/provisioningserver/utils/tests/test_network.py

files modified:
etc/celeryconfig.py

etc/maas/templates/commissioning-user-data/snippets/maas_ipmi_autodetect.py

etc/maas/templates/commissioning-user-data/snippets/tests/test_maas_ipmi_autodetect.py

required-packages/base

setup.py

src/maasserver/api.py

src/maasserver/dns.py

src/maasserver/enum.py

src/maasserver/eventloop.py

src/maasserver/forms.py

src/maasserver/migrations/0048_add_key_to_filestorage.py

src/maasserver/migrations/0084_add_ssl_key_model.py

src/maasserver/models/bootsource.py

src/maasserver/models/dhcplease.py

src/maasserver/models/network.py

src/maasserver/models/node.py

src/maasserver/models/nodegroupinterface.py

src/maasserver/models/staticipaddress.py

src/maasserver/models/tests/test_dhcplease.py

src/maasserver/models/tests/test_network.py

src/maasserver/models/tests/test_node.py

src/maasserver/models/tests/test_nodegroupinterface.py

src/maasserver/models/tests/test_staticipaddress.py

src/maasserver/nonces_cleanup.py

src/maasserver/preseed.py

src/maasserver/rpc/regionservice.py

src/maasserver/rpc/tests/test_regionservice.py

src/maasserver/tasks.py

src/maasserver/templates/maasserver/prefs.html

src/maasserver/testing/factory.py

src/maasserver/tests/test_api.py

src/maasserver/tests/test_api_nodegroup.py

src/maasserver/tests/test_api_pxeconfig.py

src/maasserver/tests/test_dhcp.py

src/maasserver/tests/test_dns.py

src/maasserver/tests/test_eventloop.py

src/maasserver/tests/test_forms.py

src/maasserver/tests/test_nonces_cleanup.py

src/maasserver/tests/test_preseed.py

src/maasserver/tests/test_start_up.py

src/maasserver/tests/test_tasks.py

src/maasserver/urls.py

src/maasserver/urls_api.py

src/maasserver/utils/async.py

src/maasserver/utils/tests/test_async.py

src/maasserver/views/prefs.py

src/maasserver/views/tests/test_rpc.py

src/maastesting/factory.py

src/metadataserver/api.py

src/provisioningserver/boot/__init__.py

src/provisioningserver/boot/powernv.py

src/provisioningserver/boot/pxe.py

src/provisioningserver/boot/tests/test_boot.py

src/provisioningserver/boot/tests/test_powernv.py

src/provisioningserver/boot/tests/test_pxe.py

src/provisioningserver/boot/tests/test_uefi.py

src/provisioningserver/dhcp/config.py

src/provisioningserver/dhcp/tests/test_config.py

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

src/provisioningserver/drivers/osystem/__init__.py

src/provisioningserver/rpc/arguments.py

src/provisioningserver/rpc/region.py

src/provisioningserver/rpc/tests/test_arguments.py

src/provisioningserver/tasks.py

src/provisioningserver/utils/__init__.py

src/provisioningserver/utils/tests/test_utils.py

Show diffs side-by-side

added added

removed removed

contrib/preseeds_v2/curtin_userdata_windows

contrib/preseeds_v2/preseed_master_windows_amd64_generic_win2012

contrib/preseeds_v2/preseed_master_windows_amd64_generic_win2012hv

contrib/preseeds_v2/preseed_master_windows_amd64_generic_win2012hvr2

contrib/preseeds_v2/preseed_master_windows_amd64_generic_win2012r2

etc/celeryconfig.py

etc/maas/templates/commissioning-user-data/snippets/maas_ipmi_autodetect.py

etc/maas/templates/commissioning-user-data/snippets/tests/test_maas_ipmi_autodetect.py

etc/maas/templates/pxe/config.poweroff.template

etc/maas/templates/uefi/config.poweroff.template

etc/maas/templates/windows/

required-packages/base

src/maasserver/api.py

src/maasserver/dns.py

src/maasserver/enum.py

src/maasserver/eventloop.py

src/maasserver/forms.py

src/maasserver/migrations/0048_add_key_to_filestorage.py

src/maasserver/migrations/0084_add_ssl_key_model.py

src/maasserver/migrations/0085_add_user_to_staticipaddress.py

src/maasserver/models/bootsource.py

src/maasserver/models/dhcplease.py

src/maasserver/models/network.py

src/maasserver/models/node.py

src/maasserver/models/nodegroupinterface.py

src/maasserver/models/staticipaddress.py

src/maasserver/models/tests/test_dhcplease.py

src/maasserver/models/tests/test_network.py

src/maasserver/models/tests/test_node.py

src/maasserver/models/tests/test_nodegroupinterface.py

src/maasserver/models/tests/test_staticipaddress.py

src/maasserver/nonces_cleanup.py

src/maasserver/preseed.py

src/maasserver/rpc/bootsources.py

src/maasserver/rpc/regionservice.py

src/maasserver/rpc/tests/test_bootsources.py

src/maasserver/rpc/tests/test_regionservice.py

src/maasserver/tasks.py

src/maasserver/templates/maasserver/prefs.html

src/maasserver/templates/maasserver/prefs_add_sslkey.html

src/maasserver/templates/maasserver/prefs_confirm_delete_sslkey.html

src/maasserver/testing/eventloop.py

src/maasserver/testing/factory.py

src/maasserver/tests/test_api.py

src/maasserver/tests/test_api_nodegroup.py

src/maasserver/tests/test_api_pxeconfig.py

src/maasserver/tests/test_api_ssl_key.py

src/maasserver/tests/test_dhcp.py

src/maasserver/tests/test_dns.py

src/maasserver/tests/test_eventloop.py

src/maasserver/tests/test_forms.py

src/maasserver/tests/test_nonces_cleanup.py

src/maasserver/tests/test_preseed.py

src/maasserver/tests/test_start_up.py

src/maasserver/tests/test_tasks.py

src/maasserver/urls.py

src/maasserver/urls_api.py

src/maasserver/utils/async.py

src/maasserver/utils/tests/test_async.py

src/maasserver/views/prefs.py

src/maasserver/views/tests/test_rpc.py

src/maastesting/factory.py

src/metadataserver/api.py

src/provisioningserver/boot/__init__.py

src/provisioningserver/boot/powernv.py

src/provisioningserver/boot/pxe.py

src/provisioningserver/boot/tests/test_boot.py

src/provisioningserver/boot/tests/test_powernv.py

src/provisioningserver/boot/tests/test_pxe.py

src/provisioningserver/boot/tests/test_uefi.py

src/provisioningserver/boot/tests/test_windows.py

src/provisioningserver/boot/windows.py

src/provisioningserver/dhcp/config.py

src/provisioningserver/dhcp/tests/test_config.py

src/provisioningserver/drivers/hardware/mscm.py

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

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

src/provisioningserver/drivers/osystem/__init__.py

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

src/provisioningserver/drivers/osystem/windows.py

src/provisioningserver/rpc/arguments.py

src/provisioningserver/rpc/region.py

src/provisioningserver/rpc/tests/test_arguments.py

src/provisioningserver/tasks.py

src/provisioningserver/utils/__init__.py

src/provisioningserver/utils/network.py

src/provisioningserver/utils/tests/test_network.py

src/provisioningserver/utils/tests/test_utils.py

Older »