← Back to branch summary

~allenap/maas/repackage

~allenap/maas/repackage

Viewing all changes in revision 2318.

Committer: Gavin Panella
Date: 2014-07-15 19:46:29 UTC
mfrom: (1745.2.544 maas)
Revision ID: gavin.panella@canonical.com-20140715194629-zvm73m2thd6bgby2

Merge trunk r2289.

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

pkg/maas-region/maasserver/api.py

pkg/maas-region/maasserver/apidoc.py

pkg/maas-region/maasserver/tests/test_apidoc.py

Show diffs side-by-side

added added

removed removed

pkg/maas-cluster/provisioningserver/power_schema.py

pkg/maas-region/maasserver/api.py

pkg/maas-region/maasserver/apidoc.py

pkg/maas-region/maasserver/tests/test_apidoc.py

Older »