Merge lp:~allenap/maas/delete-failing-commissioning-node-bug-994781 into lp:~maas-committers/maas/trunk
Proposed by
Gavin Panella
Status: | Merged |
---|---|
Approved by: | Gavin Panella |
Approved revision: | no longer in the source branch. |
Merged at revision: | 549 |
Proposed branch: | lp:~allenap/maas/delete-failing-commissioning-node-bug-994781 |
Merge into: | lp:~maas-committers/maas/trunk |
Diff against target: |
61 lines (+13/-12) 3 files modified
src/maasserver/node_action.py (+1/-1) src/maasserver/templates/maasserver/node_view.html (+3/-1) src/maasserver/tests/test_node_action.py (+9/-10) |
To merge this branch: | bzr merge lp:~allenap/maas/delete-failing-commissioning-node-bug-994781 |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Jeroen T. Vermeulen (community) | Approve | ||
Review via email:
|
Commit message
Only inhibit node deletion when allocated.
Description of the change
Jeroen mentioned basically what the problem was this morning during the call.
To post a comment you must log in.
I wonder if we shouldn't also allow a user to delete nodes allocated _to themselves_. “There. It's running fine now. I want to keep it like this, without further control from MAAS.”