Merge lp://staging/~lamont/maas/bug-1599223-2.0 into lp://staging/maas/2.0

Proposed by LaMont Jones
Status: Merged
Approved by: LaMont Jones
Approved revision: no longer in the source branch.
Merged at revision: 5150
Proposed branch: lp://staging/~lamont/maas/bug-1599223-2.0
Merge into: lp://staging/maas/2.0
Diff against target: 696 lines (+237/-135)
6 files modified
src/maasserver/dns/tests/test_zonegenerator.py (+11/-22)
src/maasserver/dns/zonegenerator.py (+12/-38)
src/maasserver/models/dnsresource.py (+6/-3)
src/maasserver/models/staticipaddress.py (+102/-36)
src/maasserver/models/tests/test_dnsresource.py (+2/-2)
src/maasserver/models/tests/test_staticipaddress.py (+104/-34)
To merge this branch: bzr merge lp://staging/~lamont/maas/bug-1599223-2.0
Reviewer Review Type Date Requested Status
LaMont Jones (community) Approve
Review via email: mp+299586@code.staging.launchpad.net

Commit message

Refactor get_hostname_ip_mapping() to also return interface-named rows.
When generating reverse DNS, we have to consider all of the forward zones, not just our subnet.

Description of the change

Refactor get_hostname_ip_mapping() to also return interface-named rows.
When generating reverse DNS, we have to consider all of the forward zones, not just our subnet.

To post a comment you must log in.
Revision history for this message
LaMont Jones (lamont) wrote :

Simple backport from trunk to 2.0.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches

to all changes: