Merge lp:~mpontillo/maas/dns-template-changes-1.7 into lp:maas/1.7
Proposed by
Mike Pontillo
Status: | Merged |
---|---|
Approved by: | Mike Pontillo |
Approved revision: | no longer in the source branch. |
Merged at revision: | 3376 |
Proposed branch: | lp:~mpontillo/maas/dns-template-changes-1.7 |
Merge into: | lp:maas/1.7 |
Diff against target: |
352 lines (+176/-7) 8 files modified
etc/maas/templates/dns/named.conf.options.inside.maas.template (+7/-1) src/maasserver/management/commands/edit_named_options.py (+1/-1) src/maasserver/tests/test_commands_edit_named_options.py (+2/-2) src/provisioningserver/dns/config.py (+38/-0) src/provisioningserver/dns/testing.py (+2/-0) src/provisioningserver/dns/tests/test_config.py (+117/-0) src/provisioningserver/utils/isc.py (+3/-1) src/provisioningserver/utils/tests/test_isc.py (+6/-2) |
To merge this branch: | bzr merge lp:~mpontillo/maas/dns-template-changes-1.7 |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Mike Pontillo (community) | Approve | ||
Review via email: mp+264219@code.launchpad.net |
Commit message
Allow users to define allow-* parameters in named.conf.options; prevent writing them to named.conf.
Description of the change
To post a comment you must log in.
Self-approving backport.