Merge lp:~newell-jensen/maas/2.0-fix-1632815 into lp:maas/2.0
Proposed by
Newell Jensen
Status: | Merged |
---|---|
Approved by: | Newell Jensen |
Approved revision: | no longer in the source branch. |
Merged at revision: | 5198 |
Proposed branch: | lp:~newell-jensen/maas/2.0-fix-1632815 |
Merge into: | lp:maas/2.0 |
Diff against target: |
33 lines (+5/-6) 2 files modified
src/maasserver/models/node.py (+5/-3) src/maasserver/models/tests/test_node.py (+0/-3) |
To merge this branch: | bzr merge lp:~newell-jensen/maas/2.0-fix-1632815 |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Newell Jensen (community) | Approve | ||
Review via email: mp+308316@code.launchpad.net |
Commit message
Backport trunk r5475: During release, check if return deferred from _stop is None, as _stop will return None for 'manual' power type.
To post a comment you must log in.
Self approved backport.