Merge lp:~ltrager/maas/lp1636858_2.0 into lp:maas/2.0
Proposed by
Lee Trager
Status: | Merged | ||||
---|---|---|---|---|---|
Approved by: | Lee Trager | ||||
Approved revision: | no longer in the source branch. | ||||
Merged at revision: | 5202 | ||||
Proposed branch: | lp:~ltrager/maas/lp1636858_2.0 | ||||
Merge into: | lp:maas/2.0 | ||||
Diff against target: |
72 lines (+27/-6) 3 files modified
etc/maas/templates/commissioning-user-data/snippets/maas_enlist.sh (+1/-1) src/maasserver/api/tests/test_machines.py (+18/-1) src/maasserver/forms.py (+8/-4) |
||||
To merge this branch: | bzr merge lp:~ltrager/maas/lp1636858_2.0 | ||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Lee Trager (community) | Approve | ||
Review via email: mp+309413@code.launchpad.net |
Commit message
Backport from 2.1.1 - If the power_parameters are the empty string set them to an empty dictionary, don't use json.loads
Description of the change
To post a comment you must log in.
Voting does not meet specified criteria. Required: Approve >= 1, Disapprove == 0. Got: .