Merge lp:~andreserl/maas/backport_rev1410_to_stabilization into lp:maas/1.2
Proposed by
Andres Rodriguez
Status: | Merged | ||||
---|---|---|---|---|---|
Approved by: | Andres Rodriguez | ||||
Approved revision: | no longer in the source branch. | ||||
Merged at revision: | 1340 | ||||
Proposed branch: | lp:~andreserl/maas/backport_rev1410_to_stabilization | ||||
Merge into: | lp:maas/1.2 | ||||
Diff against target: |
147 lines (+92/-0) 5 files modified
src/maasserver/models/node.py (+1/-0) src/maasserver/power_parameters.py (+19/-0) src/provisioningserver/enum.py (+4/-0) src/provisioningserver/power/templates/fence_cdu.template (+54/-0) src/provisioningserver/power/tests/test_poweraction.py (+14/-0) |
||||
To merge this branch: | bzr merge lp:~andreserl/maas/backport_rev1410_to_stabilization | ||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Raphaël Badin (community) | Approve | ||
Review via email: mp+140907@code.launchpad.net |
Commit message
Backport rev1410: Add fence_cdu power type.
To post a comment you must log in.
The Jenkins job https:/ /jenkins. qa.ubuntu. com/job/ maas-merger- quantal/ 309/console reported an error when processing this lp:~andreserl/maas/backport_rev1410_to_stabilization branch.
Not merging it.