← Back to branch summary

~gmb/maas/backports

~gmb/maas/backports

Viewing all changes in revision 3074.1.11.

Committer: Gavin Panella
Date: 2014-09-29 15:26:08 UTC
mfrom: (3124 maas)
mto: This revision was merged to the branch mainline in revision 3125.
Revision ID: gavin.panella@canonical.com-20140929152608-73b1soyzub5dhe6w

Merge trunk, resolving conflicts.

files added:
contrib/preseeds_v2/curtin_userdata_custom

etc/maas/templates/commissioning-user-data/user_data_disk_erasing.template

src/maasserver/bootsources.py

src/maasserver/event_connect.py

src/maasserver/migrations/0113_add_boot_source_cache_model.py

src/maasserver/models/bootsourcecache.py

src/maasserver/static/css/components/fluid.css

src/maasserver/static/css/components/spinner.css

src/maasserver/static/js/shortpoll.js

src/maasserver/static/js/tests/test_shortpoll.html

src/maasserver/static/js/tests/test_shortpoll.js

src/maasserver/templates/maasserver/image_confirm_delete.html

src/maasserver/templates/maasserver/images.html

src/maasserver/tests/test_bootsources.py

src/maasserver/tests/test_event_connect.py

src/maasserver/views/images.py

src/maasserver/views/tests/test_images.py

src/metadataserver/user_data/disk_erasing.py

src/metadataserver/user_data/tests/test_disk_erasing.py

src/provisioningserver/drivers/osystem/custom.py

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

src/provisioningserver/tests/test_udev.py

src/provisioningserver/udev.py

src/provisioningserver/utils/curtin.py

src/provisioningserver/utils/tests/test_curtin.py

files renamed:
src/metadataserver/user_data/tests/test_user_data.py => src/metadataserver/user_data/tests/test_commissioning.py

files modified:
contrib/preseeds_v2/curtin_userdata

contrib/preseeds_v2/enlist_userdata

etc/maas/templates/commissioning-user-data/user_data_config.template

services/reloader/run

setup.py

src/maasserver/api/nodes.py

src/maasserver/api/tests/test_doc.py

src/maasserver/api/tests/test_enlistment.py

src/maasserver/api/tests/test_node.py

src/maasserver/bootresources.py

src/maasserver/clusterrpc/boot_images.py

src/maasserver/clusterrpc/osystems.py

src/maasserver/clusterrpc/tests/test_boot_images.py

src/maasserver/clusterrpc/tests/test_dhcp.py

src/maasserver/clusterrpc/tests/test_osystems.py

src/maasserver/components.py

src/maasserver/context_processors.py

src/maasserver/enum.py

src/maasserver/eventloop.py

src/maasserver/forms.py

src/maasserver/forms_settings.py

src/maasserver/locks.py

src/maasserver/models/__init__.py

src/maasserver/models/bootresource.py

src/maasserver/models/bootresourcefile.py

src/maasserver/models/bootsource.py

src/maasserver/models/config.py

src/maasserver/models/node.py

src/maasserver/models/nodegroup.py

src/maasserver/models/tests/test_bootresource.py

src/maasserver/models/tests/test_bootsource.py

src/maasserver/models/tests/test_node.py

src/maasserver/models/tests/test_nodegroup.py

src/maasserver/networking_preseed.py

src/maasserver/node_action.py

src/maasserver/node_status.py

src/maasserver/preseed.py

src/maasserver/rpc/nodes.py

src/maasserver/rpc/regionservice.py

src/maasserver/rpc/testing/doubles.py

src/maasserver/rpc/tests/test_nodes.py

src/maasserver/rpc/tests/test_regionservice.py

src/maasserver/start_up.py

src/maasserver/static/css/components/table_list.css

src/maasserver/static/js/node.js

src/maasserver/static/js/node_views.js

src/maasserver/static/js/nodes_chart.js

src/maasserver/static/js/tests/test_node_views.html

src/maasserver/static/js/tests/test_node_views.js

src/maasserver/static/js/tests/test_nodes_chart.html

src/maasserver/static/js/tests/test_nodes_chart.js

src/maasserver/templates/maasserver/base.html

src/maasserver/templates/maasserver/cluster_listing_head.html

src/maasserver/templates/maasserver/cluster_listing_row.html

src/maasserver/templates/maasserver/index.html

src/maasserver/templates/maasserver/node_edit.html

src/maasserver/templates/maasserver/settings.html

src/maasserver/testing/factory.py

src/maasserver/testing/testcase.py

src/maasserver/tests/test_bootresources.py

src/maasserver/tests/test_eventloop.py

src/maasserver/tests/test_forms_node.py

src/maasserver/tests/test_monitor_connect.py

src/maasserver/tests/test_networking_preseed.py

src/maasserver/tests/test_node_action.py

src/maasserver/tests/test_preseed.py

src/maasserver/tests/test_start_up.py

src/maasserver/urls.py

src/maasserver/views/nodes.py

src/maasserver/views/settings.py

src/maasserver/views/tests/test_clusters.py

src/maasserver/views/tests/test_nodes.py

src/maasserver/views/tests/test_settings.py

src/maastesting/matchers.py

src/metadataserver/api.py

src/metadataserver/tests/test_api.py

src/provisioningserver/boot/tests/test_windows.py

src/provisioningserver/boot/windows.py

src/provisioningserver/drivers/hardware/mscm.py

src/provisioningserver/drivers/osystem/__init__.py

src/provisioningserver/events.py

src/provisioningserver/rpc/boot_images.py

src/provisioningserver/rpc/cluster.py

src/provisioningserver/rpc/clusterservice.py

src/provisioningserver/rpc/exceptions.py

src/provisioningserver/rpc/osystems.py

src/provisioningserver/rpc/power.py

src/provisioningserver/rpc/region.py

src/provisioningserver/rpc/tests/test_boot_images.py

src/provisioningserver/rpc/tests/test_clusterservice.py

src/provisioningserver/rpc/tests/test_osystems.py

src/provisioningserver/rpc/tests/test_power.py

Show diffs side-by-side

added added

removed removed

contrib/preseeds_v2/curtin_userdata

contrib/preseeds_v2/curtin_userdata_custom

contrib/preseeds_v2/enlist_userdata

etc/maas/templates/commissioning-user-data/user_data_config.template

etc/maas/templates/commissioning-user-data/user_data_disk_erasing.template

services/reloader/run

src/maasserver/api/nodes.py

src/maasserver/api/tests/test_doc.py

src/maasserver/api/tests/test_enlistment.py

src/maasserver/api/tests/test_node.py

src/maasserver/bootresources.py

src/maasserver/bootsources.py

src/maasserver/clusterrpc/boot_images.py

src/maasserver/clusterrpc/osystems.py

src/maasserver/clusterrpc/tests/test_boot_images.py

src/maasserver/clusterrpc/tests/test_dhcp.py

src/maasserver/clusterrpc/tests/test_osystems.py

src/maasserver/components.py

src/maasserver/context_processors.py

src/maasserver/enum.py

src/maasserver/event_connect.py

src/maasserver/eventloop.py

src/maasserver/forms.py

src/maasserver/forms_settings.py

src/maasserver/locks.py

src/maasserver/migrations/0113_add_boot_source_cache_model.py

src/maasserver/models/__init__.py

src/maasserver/models/bootresource.py

src/maasserver/models/bootresourcefile.py

src/maasserver/models/bootsource.py

src/maasserver/models/bootsourcecache.py

src/maasserver/models/config.py

src/maasserver/models/node.py

src/maasserver/models/nodegroup.py

src/maasserver/models/tests/test_bootresource.py

src/maasserver/models/tests/test_bootsource.py

src/maasserver/models/tests/test_node.py

src/maasserver/models/tests/test_nodegroup.py

src/maasserver/networking_preseed.py

src/maasserver/node_action.py

src/maasserver/node_status.py

src/maasserver/preseed.py

src/maasserver/rpc/nodes.py

src/maasserver/rpc/regionservice.py

src/maasserver/rpc/testing/doubles.py

src/maasserver/rpc/tests/test_nodes.py

src/maasserver/rpc/tests/test_regionservice.py

src/maasserver/start_up.py

src/maasserver/static/css/components/fluid.css

src/maasserver/static/css/components/spinner.css

src/maasserver/static/css/components/table_list.css

src/maasserver/static/js/node.js

src/maasserver/static/js/node_views.js

src/maasserver/static/js/nodes_chart.js

src/maasserver/static/js/shortpoll.js

src/maasserver/static/js/tests/test_node_views.html

src/maasserver/static/js/tests/test_node_views.js

src/maasserver/static/js/tests/test_nodes_chart.html

src/maasserver/static/js/tests/test_nodes_chart.js

src/maasserver/static/js/tests/test_shortpoll.html

src/maasserver/static/js/tests/test_shortpoll.js

src/maasserver/templates/maasserver/base.html

src/maasserver/templates/maasserver/cluster_listing_head.html

src/maasserver/templates/maasserver/cluster_listing_row.html

src/maasserver/templates/maasserver/image_confirm_delete.html

src/maasserver/templates/maasserver/images.html

src/maasserver/templates/maasserver/index.html

src/maasserver/templates/maasserver/node_edit.html

src/maasserver/templates/maasserver/settings.html

src/maasserver/testing/factory.py

src/maasserver/testing/testcase.py

src/maasserver/tests/test_bootresources.py

src/maasserver/tests/test_bootsources.py

src/maasserver/tests/test_event_connect.py

src/maasserver/tests/test_eventloop.py

src/maasserver/tests/test_forms_node.py

src/maasserver/tests/test_monitor_connect.py

src/maasserver/tests/test_networking_preseed.py

src/maasserver/tests/test_node_action.py

src/maasserver/tests/test_preseed.py

src/maasserver/tests/test_start_up.py

src/maasserver/urls.py

src/maasserver/views/images.py

src/maasserver/views/nodes.py

src/maasserver/views/settings.py

src/maasserver/views/tests/test_clusters.py

src/maasserver/views/tests/test_images.py

src/maasserver/views/tests/test_nodes.py

src/maasserver/views/tests/test_settings.py

src/maastesting/matchers.py

src/metadataserver/api.py

src/metadataserver/tests/test_api.py

src/metadataserver/user_data/disk_erasing.py

src/metadataserver/user_data/tests/test_commissioning.py

src/metadataserver/user_data/tests/test_disk_erasing.py

src/provisioningserver/boot/tests/test_windows.py

src/provisioningserver/boot/windows.py

src/provisioningserver/drivers/hardware/mscm.py

src/provisioningserver/drivers/osystem/__init__.py

src/provisioningserver/drivers/osystem/custom.py

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

src/provisioningserver/events.py

src/provisioningserver/rpc/boot_images.py

src/provisioningserver/rpc/cluster.py

src/provisioningserver/rpc/clusterservice.py

src/provisioningserver/rpc/exceptions.py

src/provisioningserver/rpc/osystems.py

src/provisioningserver/rpc/power.py

src/provisioningserver/rpc/region.py

src/provisioningserver/rpc/tests/test_boot_images.py

src/provisioningserver/rpc/tests/test_clusterservice.py

src/provisioningserver/rpc/tests/test_osystems.py

src/provisioningserver/rpc/tests/test_power.py

src/provisioningserver/tests/test_udev.py

src/provisioningserver/udev.py

src/provisioningserver/utils/curtin.py

src/provisioningserver/utils/tests/test_curtin.py

Older »