Merge lp://qastaging/~blake-rouse/maas/fix-1456698 into lp://qastaging/~maas-committers/maas/trunk
Proposed by
Blake Rouse
| Status: | Merged | ||||||||
|---|---|---|---|---|---|---|---|---|---|
| Approved by: | Mike Pontillo | ||||||||
| Approved revision: | no longer in the source branch. | ||||||||
| Merged at revision: | 3932 | ||||||||
| Proposed branch: | lp://qastaging/~blake-rouse/maas/fix-1456698 | ||||||||
| Merge into: | lp://qastaging/~maas-committers/maas/trunk | ||||||||
| Diff against target: |
54 lines (+14/-2) 3 files modified
src/maasserver/node_action.py (+3/-0) src/maasserver/static/partials/nodes-list.html (+1/-1) src/maasserver/tests/test_node_action.py (+10/-1) |
||||||||
| To merge this branch: | bzr merge lp://qastaging/~blake-rouse/maas/fix-1456698 | ||||||||
| Related bugs: |
|
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Mike Pontillo (community) | Approve | ||
|
Review via email:
|
|||
Commit message
Raise error when marking a node fixed when the power is on. Drive-by fix for the mis-alignment of the error icon on the nodes listing for actions.
To post a comment you must log in.
Revision history for this message
| Blake Rouse (blake-rouse) | # |
Revision history for this message
| Mike Pontillo (mpontillo) | # |
Revision history for this message
| Blake Rouse (blake-rouse) | # |
Revision history for this message
| Mike Pontillo (mpontillo) | # |
review:
Approve
Revision history for this message
| Mike Pontillo (mpontillo) | # |
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
Code looks good in general, but I'm worried that we're focused on this one corner case without seeing the big picture. (see question below)