Merge lp://qastaging/~mpontillo/maas/migrate-dns-settings-1.8 into lp://qastaging/~maas-committers/maas/trunk
Proposed by
Mike Pontillo
| Status: | Superseded |
|---|---|
| Proposed branch: | lp://qastaging/~mpontillo/maas/migrate-dns-settings-1.8 |
| Merge into: | lp://qastaging/~maas-committers/maas/trunk |
| Diff against target: |
299 lines (+125/-16) (has conflicts) 11 files modified
Makefile (+7/-0) docs/conf.py (+1/-1) src/maasserver/dns/tests/test_config.py (+4/-3) src/maasserver/fields.py (+26/-0) src/maasserver/static/css/maas-styles.css (+4/-0) src/maasserver/static/partials/node-details.html (+6/-1) src/maasserver/static/partials/node-events.html (+1/-1) src/maasserver/tests/test_fields.py (+38/-0) src/maasserver/views/tests/test_rpc.py (+11/-2) src/provisioningserver/plugin.py (+7/-0) src/provisioningserver/tests/test_plugin.py (+20/-8) Text conflict in Makefile Text conflict in src/maasserver/fields.py Text conflict in src/maasserver/static/css/maas-styles.css Text conflict in src/maasserver/static/partials/node-details.html Text conflict in src/maasserver/tests/test_fields.py Text conflict in src/maasserver/views/tests/test_rpc.py Text conflict in src/provisioningserver/plugin.py Text conflict in src/provisioningserver/tests/test_plugin.py |
| To merge this branch: | bzr merge lp://qastaging/~mpontillo/maas/migrate-dns-settings-1.8 |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| MAAS Maintainers | Pending | ||
|
Review via email:
|
|||
This proposal has been superseded by 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
