← Back to branch summary

~allenap/maas/repackage

~allenap/maas/repackage

Viewing all changes in revision 2601.

Committer: Gavin Panella
Date: 2014-07-20 19:55:45 UTC
mfrom: (1745.2.826 maas)
Revision ID: gavin.panella@canonical.com-20140720195545-nrb38yh11m42f30o

Merge trunk r2571.

files modified:
pkg/maas-cluster/etc/maas/templates/power/ipmi.template

pkg/maas-cluster/provisioningserver/power/poweraction.py

pkg/maas-cluster/provisioningserver/power/tests/test_poweraction.py

Show diffs side-by-side

added added

removed removed

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

pkg/maas-cluster/provisioningserver/power/poweraction.py

pkg/maas-cluster/provisioningserver/power/tests/test_poweraction.py

Older »