Merge lp://qastaging/~mpontillo/maas/dns-template-changes-1.8 into lp://qastaging/maas/1.8
Proposed by
Mike Pontillo
| Status: | Merged |
|---|---|
| Approved by: | Mike Pontillo |
| Approved revision: | no longer in the source branch. |
| Merged at revision: | 4019 |
| Proposed branch: | lp://qastaging/~mpontillo/maas/dns-template-changes-1.8 |
| Merge into: | lp://qastaging/maas/1.8 |
| Diff against target: |
351 lines (+176/-6) 8 files modified
etc/maas/templates/dns/named.conf.options.inside.maas.template (+7/-0) 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://qastaging/~mpontillo/maas/dns-template-changes-1.8 |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Mike Pontillo (community) | Approve | ||
|
Review via email:
|
|||
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.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
Self-approving this backport.