← Back to branch summary

~rvb/maas/fix-release

~rvb/maas/fix-release

Viewing all changes in revision 3154.

Committer: Raphael Badin
Date: 2014-10-03 07:41:14 UTC
mfrom: (3148.1.41 maas)
Revision ID: raphael.badin@canonical.com-20141003074114-8w3tarp0adq3exwt

Merge trunk.

files added:
src/maasserver/rpc/clusters.py

src/maasserver/rpc/tests/test_clusters.py

src/maasserver/static/js/image.js

src/maasserver/static/js/image_views.js

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

src/maasserver/static/js/tests/test_image.js

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

src/maasserver/static/js/tests/test_image_views.js

src/maasserver/templates/maasserver/settings_add_license_key.html

src/maasserver/templates/maasserver/settings_confirm_delete_license_key.html

src/maasserver/templates/maasserver/settings_edit_license_key.html

src/maasserver/templates/maasserver/settings_license_keys.html

src/maasserver/views/settings_license_keys.py

src/maasserver/views/tests/test_settings_license_keys.py

src/provisioningserver/security.py

src/provisioningserver/tests/test_security.py

files modified:
Makefile

buildout.cfg

docs/development/lease-scanning-and-dns.rst

etc/maas/templates/power/amt.template

etc/maas/templates/power/virsh.template

src/maasserver/api/node_groups.py

src/maasserver/api/nodes.py

src/maasserver/api/pxeconfig.py

src/maasserver/api/tests/test_pxeconfig.py

src/maasserver/api/tests/test_register.py

src/maasserver/clusterrpc/osystems.py

src/maasserver/clusterrpc/tests/test_osystems.py

src/maasserver/clusterrpc/utils.py

src/maasserver/context_processors.py

src/maasserver/forms.py

src/maasserver/middleware.py

src/maasserver/models/config.py

src/maasserver/models/event.py

src/maasserver/models/node.py

src/maasserver/models/tests/test_event.py

src/maasserver/networking_preseed.py

src/maasserver/preseed.py

src/maasserver/rpc/__init__.py

src/maasserver/rpc/events.py

src/maasserver/rpc/leases.py

src/maasserver/rpc/regionservice.py

src/maasserver/rpc/testing/mixins.py

src/maasserver/rpc/tests/test_regionservice.py

src/maasserver/security.py

src/maasserver/templates/maasserver/images.html

src/maasserver/templates/maasserver/js-conf.html

src/maasserver/templates/maasserver/node_view.html

src/maasserver/templates/maasserver/settings.html

src/maasserver/templates/maasserver/snippets.html

src/maasserver/templates/metadataserver/nodecommissionresult.html

src/maasserver/testing/testcase.py

src/maasserver/tests/test_js.py

src/maasserver/tests/test_middleware.py

src/maasserver/tests/test_networking_preseed.py

src/maasserver/tests/test_preseed.py

src/maasserver/tests/test_security.py

src/maasserver/urls.py

src/maasserver/views/images.py

src/maasserver/views/nodes.py

src/maasserver/views/rpc.py

src/maasserver/views/settings.py

src/maasserver/views/tests/test_images.py

src/maasserver/views/tests/test_nodes.py

src/maasserver/views/tests/test_rpc.py

src/maasserver/views/tests/test_settings.py

src/provisioningserver/boot/__init__.py

src/provisioningserver/boot/powerkvm.py

src/provisioningserver/boot/pxe.py

src/provisioningserver/boot/uefi.py

src/provisioningserver/events.py

src/provisioningserver/import_images/boot_image_mapping.py

src/provisioningserver/import_images/boot_resources.py

src/provisioningserver/import_images/testing/factory.py

src/provisioningserver/import_images/tests/test_boot_image_mapping.py

src/provisioningserver/import_images/tests/test_boot_resources.py

src/provisioningserver/network.py

src/provisioningserver/plugin.py

src/provisioningserver/pserv_services/dhcp_probe_service.py

src/provisioningserver/pserv_services/image_download_service.py

src/provisioningserver/pserv_services/lease_upload_service.py

src/provisioningserver/pserv_services/tests/test_dhcp_probe_service.py

src/provisioningserver/pserv_services/tests/test_image_download_service.py

src/provisioningserver/pserv_services/tests/test_lease_upload_service.py

src/provisioningserver/rpc/cluster.py

src/provisioningserver/rpc/clusterservice.py

src/provisioningserver/rpc/exceptions.py

src/provisioningserver/rpc/power.py

src/provisioningserver/rpc/region.py

src/provisioningserver/rpc/tests/test_clusterservice.py

src/provisioningserver/rpc/tests/test_power.py

src/provisioningserver/start_cluster_controller.py

src/provisioningserver/tests/test_plugin.py

src/provisioningserver/tests/test_start_cluster_controller.py

versions.cfg

Show diffs side-by-side

added added

removed removed

docs/development/lease-scanning-and-dns.rst

etc/maas/templates/power/amt.template

etc/maas/templates/power/virsh.template

src/maasserver/api/node_groups.py

src/maasserver/api/nodes.py

src/maasserver/api/pxeconfig.py

src/maasserver/api/tests/test_pxeconfig.py

src/maasserver/api/tests/test_register.py

src/maasserver/clusterrpc/osystems.py

src/maasserver/clusterrpc/tests/test_osystems.py

src/maasserver/clusterrpc/utils.py

src/maasserver/context_processors.py

src/maasserver/forms.py

src/maasserver/middleware.py

src/maasserver/models/config.py

src/maasserver/models/event.py

src/maasserver/models/node.py

src/maasserver/models/tests/test_event.py

src/maasserver/networking_preseed.py

src/maasserver/preseed.py

src/maasserver/rpc/__init__.py

src/maasserver/rpc/clusters.py

src/maasserver/rpc/events.py

src/maasserver/rpc/leases.py

src/maasserver/rpc/regionservice.py

src/maasserver/rpc/testing/mixins.py

src/maasserver/rpc/tests/test_clusters.py

src/maasserver/rpc/tests/test_regionservice.py

src/maasserver/security.py

src/maasserver/static/js/image.js

src/maasserver/static/js/image_views.js

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

src/maasserver/static/js/tests/test_image.js

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

src/maasserver/static/js/tests/test_image_views.js

src/maasserver/templates/maasserver/images.html

src/maasserver/templates/maasserver/js-conf.html

src/maasserver/templates/maasserver/node_view.html

src/maasserver/templates/maasserver/settings.html

src/maasserver/templates/maasserver/settings_add_license_key.html

src/maasserver/templates/maasserver/settings_confirm_delete_license_key.html

src/maasserver/templates/maasserver/settings_edit_license_key.html

src/maasserver/templates/maasserver/settings_license_keys.html

src/maasserver/templates/maasserver/snippets.html

src/maasserver/templates/metadataserver/nodecommissionresult.html

src/maasserver/testing/testcase.py

src/maasserver/tests/test_js.py

src/maasserver/tests/test_middleware.py

src/maasserver/tests/test_networking_preseed.py

src/maasserver/tests/test_preseed.py

src/maasserver/tests/test_security.py

src/maasserver/urls.py

src/maasserver/views/images.py

src/maasserver/views/nodes.py

src/maasserver/views/rpc.py

src/maasserver/views/settings.py

src/maasserver/views/settings_license_keys.py

src/maasserver/views/tests/test_images.py

src/maasserver/views/tests/test_nodes.py

src/maasserver/views/tests/test_rpc.py

src/maasserver/views/tests/test_settings.py

src/maasserver/views/tests/test_settings_license_keys.py

src/provisioningserver/boot/__init__.py

src/provisioningserver/boot/powerkvm.py

src/provisioningserver/boot/pxe.py

src/provisioningserver/boot/uefi.py

src/provisioningserver/events.py

src/provisioningserver/import_images/boot_image_mapping.py

src/provisioningserver/import_images/boot_resources.py

src/provisioningserver/import_images/testing/factory.py

src/provisioningserver/import_images/tests/test_boot_image_mapping.py

src/provisioningserver/import_images/tests/test_boot_resources.py

src/provisioningserver/network.py

src/provisioningserver/plugin.py

src/provisioningserver/pserv_services/dhcp_probe_service.py

src/provisioningserver/pserv_services/image_download_service.py

src/provisioningserver/pserv_services/lease_upload_service.py

src/provisioningserver/pserv_services/tests/test_dhcp_probe_service.py

src/provisioningserver/pserv_services/tests/test_image_download_service.py

src/provisioningserver/pserv_services/tests/test_lease_upload_service.py

src/provisioningserver/rpc/cluster.py

src/provisioningserver/rpc/clusterservice.py

src/provisioningserver/rpc/exceptions.py

src/provisioningserver/rpc/power.py

src/provisioningserver/rpc/region.py

src/provisioningserver/rpc/tests/test_clusterservice.py

src/provisioningserver/rpc/tests/test_power.py

src/provisioningserver/security.py

src/provisioningserver/start_cluster_controller.py

src/provisioningserver/tests/test_plugin.py

src/provisioningserver/tests/test_security.py

src/provisioningserver/tests/test_start_cluster_controller.py

Older »