← Back to branch summary

~allenap/maas/repackage

~allenap/maas/repackage

Viewing all changes in revision 2441.

Committer: Gavin Panella
Date: 2014-07-15 20:09:31 UTC
mfrom: (1745.2.667 maas)
Revision ID: gavin.panella@canonical.com-20140715200931-tf71h4gu2fqgo2ot

Merge trunk r2412, resolving minor conflicts.

files added:
pkg/maas-cluster/provisioningserver/drivers/hardware/tests/test_umg.py

pkg/maas-cluster/provisioningserver/drivers/hardware/umg.py

files modified:
pkg/maas-cluster/configure.py

pkg/maas-cluster/packages.txt

pkg/maas-cluster/setup.py

Show diffs side-by-side

added added

removed removed

pkg/maas-cluster/configure.py

pkg/maas-cluster/packages.txt

pkg/maas-cluster/provisioningserver/drivers/hardware/tests/test_umg.py

pkg/maas-cluster/provisioningserver/drivers/hardware/umg.py

pkg/maas-cluster/setup.py

Older »