← Back to branch summary

~allenap/maas/repackage

~allenap/maas/repackage

Viewing all changes in revision 2406.

Committer: Gavin Panella
Date: 2014-07-15 19:59:44 UTC
mfrom: (1745.2.632 maas)
Revision ID: gavin.panella@canonical.com-20140715195944-pgi9dtbv0d8nuuk4

Merge trunk r2377, resolving minor conflicts.

files removed:
pkg/maas-cluster/etc/maas/bootresources.yaml

files modified:
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/etc/maas/bootresources.yaml

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

pkg/maas-cluster/provisioningserver/upgrade_cluster.py

Older »