← Back to branch summary

~allenap/maas/repackage

~allenap/maas/repackage

Viewing all changes in revision 2093.

Committer: Gavin Panella
Date: 2014-03-30 21:32:48 UTC
mfrom: (1745.2.323 maas)
Revision ID: gavin.panella@canonical.com-20140330213248-4jtysy4b2kmuivx6

Merge trunk r2068.

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

pkg/maas-region/maasserver/power_parameters.py

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

Show diffs side-by-side

added added

removed removed

pkg/maas-cluster/provisioningserver/power_schema.py

pkg/maas-region/maasserver/power_parameters.py

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

Older »