← Back to branch summary

~allenap/maas/repackage

~allenap/maas/repackage

Viewing all changes in revision 2080.

Committer: Gavin Panella
Date: 2014-03-30 21:31:44 UTC
mfrom: (1745.2.310 maas)
Revision ID: gavin.panella@canonical.com-20140330213144-x9q1815pkci3z3wx

Merge trunk r2055.

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

pkg/maas-region/maasserver/forms.py

pkg/maas-region/maasserver/models/node.py

pkg/maas-region/maasserver/power_parameters.py

Show diffs side-by-side

added added

removed removed

pkg/maas-cluster/provisioningserver/enum.py

pkg/maas-region/maasserver/forms.py

pkg/maas-region/maasserver/models/node.py

pkg/maas-region/maasserver/power_parameters.py

Older »