← Back to branch summary

~allenap/maas/repackage

~allenap/maas/repackage

Viewing all changes in revision 2092.

Committer: Gavin Panella
Date: 2014-03-30 21:32:47 UTC
mfrom: (1745.2.322 maas)
Revision ID: gavin.panella@canonical.com-20140330213247-pl7zw4xxhntj5fjr

Merge trunk r2067.

files modified:
pkg/maas-cluster/provisioningserver/rpc/cluster.py

pkg/maas-cluster/provisioningserver/rpc/clusterservice.py

pkg/maas-cluster/provisioningserver/rpc/tests/test_clusterservice.py

Show diffs side-by-side

added added

removed removed

pkg/maas-cluster/provisioningserver/rpc/cluster.py

pkg/maas-cluster/provisioningserver/rpc/clusterservice.py

pkg/maas-cluster/provisioningserver/rpc/tests/test_clusterservice.py

Older »