lp:~lamont/maas/dns-2.0

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:~maas-committers/maas/trunk at revision 4528

Mike Pontillo (community): Approve on 2015-11-28

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

Link a bug report

Related blueprints

4585. By LaMont Jones on 2015-12-29

Fix lint errors.

4584. By LaMont Jones on 2015-12-29

Allow node queries to be limited by domain name.

4583. By LaMont Jones on 2015-12-29

Cleanup data migration.

4582. By LaMont Jones on 2015-12-28

Add domains to api urls.

4581. By LaMont Jones on 2015-12-22

Finish out unit tests for dns_update_by_node.

4580. By LaMont Jones on 2015-12-22

Consolidate the calls to the consolidator for update_by_node. Handle None getting passed to add_{domain,subnet}.

4579. By LaMont Jones on 2015-12-22

Websocket query count increases because of Node.Domain.

4578. By LaMont Jones on 2015-12-22

merge from trunk

4577. By Andres Rodriguez on 2015-12-22

[r=blake-rouse][bug=][author=andreserl] required-packages/base: Depend on python-formencode as tests require it.

4576. By Lee Trager on 2015-12-21

[r=blake-rouse][bug=][author=ltrager] Restructure the node model to be used as parent object for device, machine, and rack controller.