Merge lp://staging/~rvb/maas/bug-1234853-1.3 into lp://staging/maas/1.3
Proposed by
Raphaël Badin
| Status: | Merged |
|---|---|
| Approved by: | Raphaël Badin |
| Approved revision: | no longer in the source branch. |
| Merged at revision: | 1474 |
| Proposed branch: | lp://staging/~rvb/maas/bug-1234853-1.3 |
| Merge into: | lp://staging/maas/1.3 |
| Diff against target: |
129 lines (+31/-24) 5 files modified
src/maasserver/api.py (+3/-3) src/maasserver/forms.py (+3/-10) src/maasserver/tests/test_forms.py (+3/-10) src/maasserver/tests/test_views_settings_clusters.py (+15/-0) src/maasserver/views/settings_clusters.py (+7/-1) |
| To merge this branch: | bzr merge lp://staging/~rvb/maas/bug-1234853-1.3 |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Raphaël Badin (community) | Approve | ||
|
Review via email:
|
|||
Commit message
Fix the add-new-interface UI so that it doesn't blow up when the nodegroup is already 'managed' and one is trying to add another 'managed' interface (backport of revision 1661).
To post a comment you must log in.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
Simple backport, self-approving.