Merge lp:~mpontillo/maas/dhcp-with-aliases--bug-1600267--1.9 into lp:maas/1.9
Proposed by
Mike Pontillo
Status: | Merged |
---|---|
Approved by: | Mike Pontillo |
Approved revision: | no longer in the source branch. |
Merged at revision: | 4591 |
Proposed branch: | lp:~mpontillo/maas/dhcp-with-aliases--bug-1600267--1.9 |
Merge into: | lp:maas/1.9 |
Diff against target: |
87 lines (+16/-11) 2 files modified
src/maasserver/static/js/angular/controllers/node_details_networking.js (+8/-7) src/maasserver/static/js/angular/controllers/tests/test_node_details_networking.js (+8/-4) |
To merge this branch: | bzr merge lp:~mpontillo/maas/dhcp-with-aliases--bug-1600267--1.9 |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Mike Pontillo (community) | Approve | ||
Review via email:
|
Commit message
Backport revision 5166 from trunk to fix adding aliases to interfaces where DHCP is enabled.
To post a comment you must log in.
Self-approved backport.