MAAS

Merge lp://qastaging/~mpontillo/maas/migrate-dns-settings-1.7 into lp://qastaging/maas/1.7

  1. migrate-dns-settings-1.7
  2. Merge into 1.7
Proposed by Mike Pontillo
Status: Merged
Approved by: Mike Pontillo
Approved revision: no longer in the source branch.
Merged at revision: 3375
Proposed branch: lp://qastaging/~mpontillo/maas/migrate-dns-settings-1.7
Merge into: lp://qastaging/maas/1.7
Diff against target: 639 lines (+372/-31)
5 files modified
docs/changelog.rst (+11/-0)
src/maasserver/management/commands/edit_named_options.py (+96/-12)
src/maasserver/tests/test_commands_edit_named_options.py (+141/-9)
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.7
Reviewer Review Type Date Requested Status
Andres Rodriguez (community) Approve
Review via email: mp+264089@code.qastaging.launchpad.net

This proposal supersedes a proposal from 2015-07-08.

Commit message

Backport DNS migration fixes (Merge revision 4077 from trunk)

To post a comment you must log in.
Revision history for this message
Andres Rodriguez (andreserl) wrote :

lgtm!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches

to all changes: