← Back to branch summary

~allenap/maas/repackage

~allenap/maas/repackage

Viewing all changes in revision 2285.

Committer: Gavin Panella
Date: 2014-07-15 19:44:03 UTC
mfrom: (1745.2.511 maas)
Revision ID: gavin.panella@canonical.com-20140715194403-tlgnz1bsud3me6al

Merge trunk r2256.

files modified:
pkg/maas-cluster/provisioningserver/import_images/boot_image_mapping.py

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

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

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

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

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

Show diffs side-by-side

added added

removed removed

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

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

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

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

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

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

Older »