← Back to branch summary

~allenap/maas/repackage

~allenap/maas/repackage

Viewing all changes in revision 2369.

Committer: Gavin Panella
Date: 2014-07-15 19:47:49 UTC
mfrom: (1745.2.595 maas)
Revision ID: gavin.panella@canonical.com-20140715194749-dh0o7d5wdffkbw0j

Merge trunk r2340.

files modified:
pkg/maas-cluster/provisioningserver/boot/tests/test_tftppath.py

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

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

pkg/maas-cluster/provisioningserver/import_images/testing/factory.py

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

Show diffs side-by-side

added added

removed removed

pkg/maas-cluster/provisioningserver/boot/tests/test_tftppath.py

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

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

pkg/maas-cluster/provisioningserver/import_images/testing/factory.py

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

Older »