lp:~lamont/maas/dns-1.9

Branch merges

Propose for merging

No branches dependent on this one.

Rejected for merging into lp:maas/1.9

MAAS Committers: Pending requested 2016-01-07

Diff: 917 lines (+389/-151)

7 files modified

etc/maas/templates/dns/named.conf.template (+4/-2)
src/maasserver/dns/config.py (+4/-3)
src/provisioningserver/dns/actions.py (+17/-12)
src/provisioningserver/dns/config.py (+15/-4)
src/provisioningserver/dns/tests/test_actions.py (+4/-4)
src/provisioningserver/dns/tests/test_zoneconfig.py (+179/-52)
src/provisioningserver/dns/zoneconfig.py (+166/-74)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #1356012: maas incorrectly overmanages DNS reverse zones	High	Fix Released
Bug #1531868: Add network fails for multiple bigger-than-/24 networks in a single /16	High	Confirmed

Link a bug report

Related blueprints

4520. By LaMont Jones on 2016-02-17

Merge from maas/1.9.

4519. By LaMont Jones on 2015-11-28

Cleanup errors introduced in doing review feedback

4518. By LaMont Jones on 2015-11-28

Review feedback

4517. By LaMont Jones on 2015-11-28

For reverse zones, get_GENERATE_directives needs to follow rfc2317.

4516. By LaMont Jones on 2015-11-28

Correctly cast subnet.first to avoid errors with trusty's netaddr.

4515. By LaMont Jones on 2015-11-27

Merge DNS fixes from trunk

4514. By Lee Trager on 2015-11-26

[r=ltrager][bug=1519919][author=ltrager] Backport from trunk: Fix cluster controller networking auto detection

* Don't require that a valid NIC has a kernel module loaded
* When falling back to scanning ip addr for devices look for network devices which follow the preedictable network interface names standard.

4513. By Lee Trager on 2015-11-25

[r=ltrager][bug=1519397][author=ltrager] Cherry pick from trunk for lp1519397: Don't check empty cache_set filesystem_groups when finding parent devices

4512. By Mike Pontillo on 2015-11-25

[r=mpontillo][bug=1519247][author=mpontillo] Backport fix for bug #1519247 from trunk revision 4517.

4511. By LaMont Jones on 2015-11-25

[r=blake-rouse][bug=1519396][author=lamont] Fix broken test: minimum MTU is 552.