← Back to branch summary

~allenap/maas/repackage

~allenap/maas/repackage

Viewing all changes in revision 2034.

Committer: Gavin Panella
Date: 2014-03-30 21:21:49 UTC
mfrom: (1745.2.264 maas)
Revision ID: gavin.panella@canonical.com-20140330212149-0trse9kzgixoyzqb

Merge trunk r2009.

files added:
pkg/maas-cluster/etc/maas/templates/power/dli.template

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

pkg/maas-region/maasserver/power_parameters.py

Show diffs side-by-side

added added

removed removed

pkg/maas-cluster/etc/maas/templates/power/dli.template

pkg/maas-cluster/provisioningserver/enum.py

pkg/maas-region/maasserver/power_parameters.py

Older »