Merge lp://qastaging/~mpontillo/maas/migrate-dns-settings-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: | 4018 |
| Proposed branch: | lp://qastaging/~mpontillo/maas/migrate-dns-settings-1.8 |
| Merge into: | lp://qastaging/maas/1.8 |
| Diff against target: |
689 lines (+409/-39) 4 files modified
src/maasserver/management/commands/edit_named_options.py (+116/-14) src/maasserver/tests/test_commands_edit_named_options.py (+169/-15) src/maasserver/utils/isc.py (+25/-4) src/maasserver/utils/tests/test_isc.py (+99/-6) |
| To merge this branch: | bzr merge lp://qastaging/~mpontillo/maas/migrate-dns-settings-1.8 |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Mike Pontillo (community) | Approve | ||
| Andres Rodriguez (community) | Approve | ||
|
Review via email:
|
|||
This proposal supersedes a proposal from 2015-07-08.
Commit message
Backport DNS migration fixes (Merge revision 4077 from trunk)
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
lgtm! After a quick look!