← Back to branch summary

~allenap/maas/repackage

~allenap/maas/repackage

Viewing all changes in revision 2122.

Committer: Gavin Panella
Date: 2014-03-30 21:34:28 UTC
mfrom: (1745.2.352 maas)
Revision ID: gavin.panella@canonical.com-20140330213428-rbiopwl21yilzrdr

Merge trunk r2097.

files removed:
pkg/maas-region/maasserver/clusterrpc/utils.py

files modified:
pkg/maas-region/maasserver/clusterrpc/architecture.py

pkg/maas-region/maasserver/clusterrpc/power_parameters.py

pkg/maas-region/maasserver/clusterrpc/tests/test_architecture.py

pkg/maas-region/maasserver/clusterrpc/tests/test_power_parameters.py

Show diffs side-by-side

added added

removed removed

pkg/maas-region/maasserver/clusterrpc/architecture.py

pkg/maas-region/maasserver/clusterrpc/power_parameters.py

pkg/maas-region/maasserver/clusterrpc/tests/test_architecture.py

pkg/maas-region/maasserver/clusterrpc/tests/test_power_parameters.py

pkg/maas-region/maasserver/clusterrpc/utils.py

Older »