Merge lp:~blake-rouse/maas/fix-bug-1302818-1.5 into lp:maas/1.5

Proposed by Blake Rouse
Status: Merged
Approved by: Blake Rouse
Approved revision: no longer in the source branch.
Merged at revision: 2225
Proposed branch: lp:~blake-rouse/maas/fix-bug-1302818-1.5
Merge into: lp:maas/1.5
Diff against target: 12 lines (+1/-1)
1 file modified
src/maasserver/api.py (+1/-1)
To merge this branch: bzr merge lp:~blake-rouse/maas/fix-bug-1302818-1.5
Reviewer Review Type Date Requested Status
Graham Binns (community) Approve
Review via email: mp+214532@code.launchpad.net

Commit message

Fixes typo not allowing ipmi to be set as a power_control type for seamicro15k.

To post a comment you must log in.
Revision history for this message
Graham Binns (gmb) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/maasserver/api.py'
2--- src/maasserver/api.py 2014-04-04 21:23:24 +0000
3+++ src/maasserver/api.py 2014-04-07 13:23:26 +0000
4@@ -1712,7 +1712,7 @@
5 password = get_mandatory_param(request.data, 'password')
6 power_control = get_optional_param(
7 request.data, 'power_control', default='ipmi',
8- validator=validators.OneOf(['impi', 'restapi', 'restapi2']))
9+ validator=validators.OneOf(['ipmi', 'restapi', 'restapi2']))
10
11 nodegroup.add_seamicro15k(
12 mac, username, password, power_control=power_control)

Subscribers

People subscribed via source and target branches

to all changes: