← Back to branch summary

~allenap/maas/repackage

~allenap/maas/repackage

Viewing all changes in revision 2201.

Committer: Gavin Panella
Date: 2014-04-01 14:54:27 UTC
mfrom: (1745.2.427 maas)
Revision ID: gavin.panella@canonical.com-20140401145427-u90aou4xird3qfl2

Merge trunk r2172, resolving minor conflicts.

files modified:
pkg/maas-cluster/provisioningserver/boot_images.py

pkg/maas-cluster/provisioningserver/config.py

pkg/maas-cluster/provisioningserver/import_images/boot_resources.py

pkg/maas-cluster/provisioningserver/import_images/ephemerals_script.py

pkg/maas-cluster/provisioningserver/import_images/tests/test_boot_resources.py

pkg/maas-cluster/provisioningserver/network.py

pkg/maas-cluster/provisioningserver/pxe/tftppath.py

pkg/maas-cluster/provisioningserver/testing/config.py

pkg/maas-cluster/provisioningserver/tests/test_config.py

pkg/maas-cluster/provisioningserver/upgrade_cluster.py

pkg/maas-cluster/scripts/maas-import-pxe-files

pkg/maas-region/maasserver/dns.py

pkg/maas-region/maasserver/testing/__init__.py

Show diffs side-by-side

added added

removed removed

pkg/maas-cluster/provisioningserver/boot_images.py

pkg/maas-cluster/provisioningserver/config.py

pkg/maas-cluster/provisioningserver/import_images/boot_resources.py

pkg/maas-cluster/provisioningserver/import_images/ephemerals_script.py

pkg/maas-cluster/provisioningserver/import_images/tests/test_boot_resources.py

pkg/maas-cluster/provisioningserver/network.py

pkg/maas-cluster/provisioningserver/pxe/tftppath.py

pkg/maas-cluster/provisioningserver/testing/config.py

pkg/maas-cluster/provisioningserver/tests/test_config.py

pkg/maas-cluster/provisioningserver/upgrade_cluster.py

pkg/maas-cluster/scripts/maas-import-pxe-files

pkg/maas-region/maasserver/dns.py

pkg/maas-region/maasserver/testing/__init__.py

Older »