Merge lp:~andreserl/maas/packaging_lp1413388_1.7 into lp:~maas-maintainers/maas/packaging.utopic

Proposed by Andres Rodriguez on 2015-07-13
Status: Merged
Approved by: Andres Rodriguez on 2015-07-13
Approved revision: 366
Merged at revision: 366
Proposed branch: lp:~andreserl/maas/packaging_lp1413388_1.7
Merge into: lp:~maas-maintainers/maas/packaging.utopic
Diff against target: 52 lines (+15/-5)
3 files modified
debian/changelog (+11/-3)
debian/control (+3/-2)
debian/maas-region-controller.postinst (+1/-0)
To merge this branch: bzr merge lp:~andreserl/maas/packaging_lp1413388_1.7
Reviewer Review Type Date Requested Status
Andres Rodriguez Approve on 2015-07-13
Review via email: mp+264587@code.launchpad.net

Commit message

* debian/control: Make maas-dns a Dependy of maas-region-controller.
* debian/maas-region-controller.postinst: Ensure DNS config migration is
  always run. (LP: #1413388)
* New upstream release 1.7.6 bzr3376:

To post a comment you must log in.
Andres Rodriguez (andreserl) wrote :

selfie!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2015-07-08 01:10:06 +0000
3+++ debian/changelog 2015-07-13 15:10:25 +0000
4@@ -1,6 +1,14 @@
5-maas (1.7.6+bzr3375-0ubuntu1) trusty; urgency=medium
6-
7- * New upstream release 1.7.6 bzr3375:
8+maas (1.7.6+bzr3376-0ubuntu2) wily; urgency=medium
9+
10+ * debian/control: Make maas-dns a Dependy of maas-region-controller.
11+ * debian/maas-region-controller.postinst: Ensure DNS config migration is
12+ always run. (LP: #1413388)
13+
14+ -- Andres Rodriguez <andreserl@ubuntu.com> Fri, 10 Jul 2015 13:47:40 -0400
15+
16+maas (1.7.6+bzr3376-0ubuntu1) wily; urgency=medium
17+
18+ * New upstream release 1.7.6 bzr3376:
19 - Accept list of forwarders for upstream_dns rather than just
20 one. (LP: #1470585)
21 - Fix upgrade issue where it would remove custom DNS config,
22
23=== modified file 'debian/control'
24--- debian/control 2015-07-01 08:07:37 +0000
25+++ debian/control 2015-07-13 15:10:25 +0000
26@@ -77,11 +77,12 @@
27
28 Package: maas-region-controller
29 Architecture: all
30-Depends: maas-region-controller-min (= ${binary:Version}),
31+Depends: maas-dns (= ${binary:Version}),
32+ maas-region-controller-min (= ${binary:Version}),
33 postgresql (>= 9.1),
34 ${misc:Depends},
35 ${python:Depends}
36-Recommends: openssh-server, maas-dns (= ${binary:Version})
37+Recommends: openssh-server
38 Description: MAAS server complete region controller
39 This package installs and configures the complete MAAS region controller,
40 including the minimum setup, plus the database server and messaging queue.
41
42=== modified file 'debian/maas-region-controller.postinst'
43--- debian/maas-region-controller.postinst 2015-07-08 01:10:06 +0000
44+++ debian/maas-region-controller.postinst 2015-07-13 15:10:25 +0000
45@@ -169,6 +169,7 @@
46 db_get maas-region-controller/dbconfig-install
47 if [ "$RET" = "true" ]; then
48 maas_sync_migrate_db
49+ configure_migrate_maas_dns
50 fi
51
52 # Display installation note

Subscribers

People subscribed via source and target branches

to all changes: