Merge lp:~lamont/maas/bug-1675844 into lp:~maas-committers/maas/trunk
Proposed by
LaMont Jones
Status: | Merged |
---|---|
Approved by: | LaMont Jones |
Approved revision: | no longer in the source branch. |
Merged at revision: | 5859 |
Proposed branch: | lp:~lamont/maas/bug-1675844 |
Merge into: | lp:~maas-committers/maas/trunk |
Diff against target: |
46 lines (+24/-1) 2 files modified
src/maasserver/models/staticipaddress.py (+2/-1) src/maasserver/models/tests/test_staticipaddress.py (+22/-0) |
To merge this branch: | bzr merge lp:~lamont/maas/bug-1675844 |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Gavin Panella (community) | Approve | ||
Review via email: mp+321014@code.launchpad.net |
Commit message
For the IPv6 address for a host, prefer non-ULA addresses over ULA addresses.
Description of the change
For the IPv6 address for a host, prefer non-ULA addresses over ULA addresses.
To post a comment you must log in.
get_hostname_ ip_mapping makes me sad — though the use of SQL is good — but this change looks sound.