← Back to branch summary

~mpontillo/maas/migrate-dns-settings-trunk

~mpontillo/maas/migrate-dns-settings-trunk

Viewing all changes in revision 4063.

Committer: Mike Pontillo
Date: 2015-07-07 16:24:44 UTC
mfrom: (4058.2.13 maas)
Revision ID: mike.pontillo@canonical.com-20150707162444-ush8b4k1lezlepbs

Merge trunk

files added:
run-e2e/etc

run-e2e/etc/maas

run-e2e/etc/maas/drivers.yaml

run-e2e/etc/maas/templates

run/etc

run/etc/maas

run/etc/maas/drivers.yaml

run/etc/maas/templates

src/maasserver/migrations/0148_remove_path_from_block_device.py

src/maasserver/migrations/0149_add_label_to_filesystem.py

files removed:
etc/demo_maas_cluster.conf

etc/maas/pserv.yaml

etc/maas_cluster.conf

src/provisioningserver/cluster_config.py

src/provisioningserver/configure_maas_url.py

src/provisioningserver/tests/test_cluster_config.py

src/provisioningserver/tests/test_configure_maas_url.py

files modified:
.bzrignore

.gitignore

HACKING.txt

INSTALL.txt

Makefile

buildout.cfg

docs/development/cluster-registration.rst

etc/maas/templates/commissioning-user-data/snippets/maas_enlist.sh

required-packages/base

services/clusterd/run

setup.py

src/maas/demo.py

src/maas/development.py

src/maas/settings.py

src/maasserver/api/blockdevices.py

src/maasserver/api/partitions.py

src/maasserver/api/tests/test_blockdevice.py

src/maasserver/api/tests/test_events.py

src/maasserver/api/tests/test_partitions.py

src/maasserver/clusterrpc/tests/test_boot_images.py

src/maasserver/config.py

src/maasserver/dns/tests/test_config.py

src/maasserver/enum.py

src/maasserver/fields.py

src/maasserver/forms.py

src/maasserver/forms_settings.py

src/maasserver/models/blockdevice.py

src/maasserver/models/filesystem.py

src/maasserver/models/filesystemgroup.py

src/maasserver/models/node.py

src/maasserver/models/partition.py

src/maasserver/models/tests/test_blockdevice.py

src/maasserver/models/tests/test_filesystemgroup.py

src/maasserver/models/tests/test_partition.py

src/maasserver/models/tests/test_physicalblockdevice.py

src/maasserver/models/tests/test_virtualblockdevice.py

src/maasserver/models/virtualblockdevice.py

src/maasserver/rpc/tests/test_regionservice.py

src/maasserver/testing/factory.py

src/maasserver/tests/test_config.py

src/maasserver/tests/test_fields.py

src/maasserver/tests/test_forms_blockdevice.py

src/maasserver/tests/test_forms_settings.py

src/maasserver/utils/__init__.py

src/maasserver/utils/tests/test_utils.py

src/maasserver/utils/version.py

src/maastesting/protractor/runner.py

src/metadataserver/models/commissioningscript.py

src/metadataserver/models/tests/test_noderesults.py

src/provisioningserver/__main__.py

src/provisioningserver/boot/install_grub.py

src/provisioningserver/boot/powerkvm.py

src/provisioningserver/boot/tests/test_boot.py

src/provisioningserver/boot/tests/test_install_grub.py

src/provisioningserver/boot/tests/test_powernv.py

src/provisioningserver/boot/tests/test_pxe.py

src/provisioningserver/boot/tests/test_tftppath.py

src/provisioningserver/boot/tests/test_windows.py

src/provisioningserver/boot/tftppath.py

src/provisioningserver/boot/windows.py

src/provisioningserver/cluster_config_command.py

src/provisioningserver/config.py

src/provisioningserver/dhcp/tests/test_config.py

src/provisioningserver/dhcp/tests/test_detect.py

src/provisioningserver/diskless.py

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

src/provisioningserver/drivers/hardware/ucsm.py

src/provisioningserver/drivers/osystem/custom.py

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

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

src/provisioningserver/drivers/osystem/windows.py

src/provisioningserver/import_images/boot_resources.py

src/provisioningserver/import_images/tests/test_boot_resources.py

src/provisioningserver/path.py

src/provisioningserver/plugin.py

src/provisioningserver/pserv_services/image_download_service.py

src/provisioningserver/pserv_services/service_monitor_service.py

src/provisioningserver/pserv_services/tests/test_image_download_service.py

src/provisioningserver/pserv_services/tests/test_service_monitor_service.py

src/provisioningserver/pserv_services/tests/test_tftp.py

src/provisioningserver/pserv_services/tftp.py

src/provisioningserver/rpc/boot_images.py

src/provisioningserver/rpc/clusterservice.py

src/provisioningserver/rpc/tags.py

src/provisioningserver/rpc/testing/__init__.py

src/provisioningserver/rpc/tests/test_boot_images.py

src/provisioningserver/rpc/tests/test_clusterservice.py

src/provisioningserver/rpc/tests/test_tags.py

src/provisioningserver/testing/config.py

src/provisioningserver/testing/testcase.py

src/provisioningserver/tests/test_cluster_config_command.py

src/provisioningserver/tests/test_config.py

src/provisioningserver/tests/test_diskless.py

src/provisioningserver/tests/test_path.py

src/provisioningserver/tests/test_plugin.py

src/provisioningserver/tests/test_service_monitor.py

src/provisioningserver/tests/test_tags.py

src/provisioningserver/tests/test_upgrade_cluster.py

src/provisioningserver/upgrade_cluster.py

src/provisioningserver/utils/__init__.py

src/provisioningserver/utils/fs.py

src/provisioningserver/utils/script.py

src/provisioningserver/utils/tests/test_fs.py

src/provisioningserver/utils/tests/test_script.py

src/provisioningserver/utils/tests/test_utils.py

Show diffs side-by-side

added added

removed removed

docs/development/cluster-registration.rst

etc/demo_maas_cluster.conf

etc/maas/pserv.yaml

etc/maas/templates/commissioning-user-data/snippets/maas_enlist.sh

etc/maas_cluster.conf

required-packages/base

run-e2e/etc/maas/

run-e2e/etc/maas/drivers.yaml@

run-e2e/etc/maas/templates@

run/etc/maas/drivers.yaml@

run/etc/maas/templates@

services/clusterd/run

src/maas/demo.py

src/maas/development.py

src/maas/settings.py

src/maasserver/api/blockdevices.py

src/maasserver/api/partitions.py

src/maasserver/api/tests/test_blockdevice.py

src/maasserver/api/tests/test_events.py

src/maasserver/api/tests/test_partitions.py

src/maasserver/clusterrpc/tests/test_boot_images.py

src/maasserver/config.py

src/maasserver/dns/tests/test_config.py

src/maasserver/enum.py

src/maasserver/fields.py

src/maasserver/forms.py

src/maasserver/forms_settings.py

src/maasserver/migrations/0148_remove_path_from_block_device.py

src/maasserver/migrations/0149_add_label_to_filesystem.py

src/maasserver/models/blockdevice.py

src/maasserver/models/filesystem.py

src/maasserver/models/filesystemgroup.py

src/maasserver/models/node.py

src/maasserver/models/partition.py

src/maasserver/models/tests/test_blockdevice.py

src/maasserver/models/tests/test_filesystemgroup.py

src/maasserver/models/tests/test_partition.py

src/maasserver/models/tests/test_physicalblockdevice.py

src/maasserver/models/tests/test_virtualblockdevice.py

src/maasserver/models/virtualblockdevice.py

src/maasserver/rpc/tests/test_regionservice.py

src/maasserver/testing/factory.py

src/maasserver/tests/test_config.py

src/maasserver/tests/test_fields.py

src/maasserver/tests/test_forms_blockdevice.py

src/maasserver/tests/test_forms_settings.py

src/maasserver/utils/__init__.py

src/maasserver/utils/tests/test_utils.py

src/maasserver/utils/version.py

src/maastesting/protractor/runner.py

src/metadataserver/models/commissioningscript.py

src/metadataserver/models/tests/test_noderesults.py

src/provisioningserver/__main__.py

src/provisioningserver/boot/install_grub.py

src/provisioningserver/boot/powerkvm.py

src/provisioningserver/boot/tests/test_boot.py

src/provisioningserver/boot/tests/test_install_grub.py

src/provisioningserver/boot/tests/test_powernv.py

src/provisioningserver/boot/tests/test_pxe.py

src/provisioningserver/boot/tests/test_tftppath.py

src/provisioningserver/boot/tests/test_windows.py

src/provisioningserver/boot/tftppath.py

src/provisioningserver/boot/windows.py

src/provisioningserver/cluster_config.py

src/provisioningserver/cluster_config_command.py

src/provisioningserver/config.py

src/provisioningserver/configure_maas_url.py

src/provisioningserver/dhcp/tests/test_config.py

src/provisioningserver/dhcp/tests/test_detect.py

src/provisioningserver/diskless.py

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

src/provisioningserver/drivers/hardware/ucsm.py

src/provisioningserver/drivers/osystem/custom.py

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

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

src/provisioningserver/drivers/osystem/windows.py

src/provisioningserver/import_images/boot_resources.py

src/provisioningserver/import_images/tests/test_boot_resources.py

src/provisioningserver/path.py

src/provisioningserver/plugin.py

src/provisioningserver/pserv_services/image_download_service.py

src/provisioningserver/pserv_services/service_monitor_service.py

src/provisioningserver/pserv_services/tests/test_image_download_service.py

src/provisioningserver/pserv_services/tests/test_service_monitor_service.py

src/provisioningserver/pserv_services/tests/test_tftp.py

src/provisioningserver/pserv_services/tftp.py

src/provisioningserver/rpc/boot_images.py

src/provisioningserver/rpc/clusterservice.py

src/provisioningserver/rpc/tags.py

src/provisioningserver/rpc/testing/__init__.py

src/provisioningserver/rpc/tests/test_boot_images.py

src/provisioningserver/rpc/tests/test_clusterservice.py

src/provisioningserver/rpc/tests/test_tags.py

src/provisioningserver/testing/config.py

src/provisioningserver/testing/testcase.py

src/provisioningserver/tests/test_cluster_config.py

src/provisioningserver/tests/test_cluster_config_command.py

src/provisioningserver/tests/test_config.py

src/provisioningserver/tests/test_configure_maas_url.py

src/provisioningserver/tests/test_diskless.py

src/provisioningserver/tests/test_path.py

src/provisioningserver/tests/test_plugin.py

src/provisioningserver/tests/test_service_monitor.py

src/provisioningserver/tests/test_tags.py

src/provisioningserver/tests/test_upgrade_cluster.py

src/provisioningserver/upgrade_cluster.py

src/provisioningserver/utils/__init__.py

src/provisioningserver/utils/fs.py

src/provisioningserver/utils/script.py

src/provisioningserver/utils/tests/test_fs.py

src/provisioningserver/utils/tests/test_script.py

src/provisioningserver/utils/tests/test_utils.py

Older »