Merge lp://staging/~lamont/maas/bug-1676619-2.1 into lp://staging/maas/2.1
Proposed by
LaMont Jones
| Status: | Merged | ||||
|---|---|---|---|---|---|
| Approved by: | Mike Pontillo | ||||
| Approved revision: | no longer in the source branch. | ||||
| Merged at revision: | 5600 | ||||
| Proposed branch: | lp://staging/~lamont/maas/bug-1676619-2.1 | ||||
| Merge into: | lp://staging/maas/2.1 | ||||
| Diff against target: |
184 lines (+96/-9) 4 files modified
src/maasserver/api/dnsresourcerecords.py (+1/-1) src/maasserver/api/dnsresources.py (+3/-2) src/maasserver/forms_dnsresource.py (+28/-0) src/maasserver/tests/test_forms_dnsresource.py (+64/-6) |
||||
| To merge this branch: | bzr merge lp://staging/~lamont/maas/bug-1676619-2.1 | ||||
| Related bugs: |
|
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Mike Pontillo (community) | Approve | ||
|
Review via email:
|
|||
Commit message
Backport r5875, r5877: In the dnsresources form, allow ip_addresses to be IP address (strings), not just id numbers of existing StaticIPAddresses. If that creates a new IP, then record the user.
Description of the change
In the dnsresources form, allow ip_addresses to be IP address (strings), not just id numbers of existing StaticIPAddresses. If that creates a new IP, then record the user.
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
Looks good.