← Back to branch summary

~allenap/maas/repackage

~allenap/maas/repackage

Viewing all changes in revision 2581.

Committer: Gavin Panella
Date: 2014-07-15 20:44:12 UTC
mfrom: (1745.2.807 maas)
Revision ID: gavin.panella@canonical.com-20140715204412-0sn0wh3x4h6flh1a

Merge trunk r2552.

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

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

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

pkg/maas-cluster/provisioningserver/upgrade_cluster.py

Show diffs side-by-side

added added

removed removed

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

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

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

pkg/maas-cluster/provisioningserver/upgrade_cluster.py

Older »