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 (community) 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
=== modified file 'debian/changelog'
--- debian/changelog 2015-07-08 01:10:06 +0000
+++ debian/changelog 2015-07-13 15:10:25 +0000
@@ -1,6 +1,14 @@
1maas (1.7.6+bzr3375-0ubuntu1) trusty; urgency=medium1maas (1.7.6+bzr3376-0ubuntu2) wily; urgency=medium
22
3 * New upstream release 1.7.6 bzr3375:3 * debian/control: Make maas-dns a Dependy of maas-region-controller.
4 * debian/maas-region-controller.postinst: Ensure DNS config migration is
5 always run. (LP: #1413388)
6
7 -- Andres Rodriguez <andreserl@ubuntu.com> Fri, 10 Jul 2015 13:47:40 -0400
8
9maas (1.7.6+bzr3376-0ubuntu1) wily; urgency=medium
10
11 * New upstream release 1.7.6 bzr3376:
4 - Accept list of forwarders for upstream_dns rather than just12 - Accept list of forwarders for upstream_dns rather than just
5 one. (LP: #1470585)13 one. (LP: #1470585)
6 - Fix upgrade issue where it would remove custom DNS config,14 - Fix upgrade issue where it would remove custom DNS config,
715
=== modified file 'debian/control'
--- debian/control 2015-07-01 08:07:37 +0000
+++ debian/control 2015-07-13 15:10:25 +0000
@@ -77,11 +77,12 @@
7777
78Package: maas-region-controller78Package: maas-region-controller
79Architecture: all79Architecture: all
80Depends: maas-region-controller-min (= ${binary:Version}),80Depends: maas-dns (= ${binary:Version}),
81 maas-region-controller-min (= ${binary:Version}),
81 postgresql (>= 9.1),82 postgresql (>= 9.1),
82 ${misc:Depends},83 ${misc:Depends},
83 ${python:Depends}84 ${python:Depends}
84Recommends: openssh-server, maas-dns (= ${binary:Version})85Recommends: openssh-server
85Description: MAAS server complete region controller86Description: MAAS server complete region controller
86 This package installs and configures the complete MAAS region controller,87 This package installs and configures the complete MAAS region controller,
87 including the minimum setup, plus the database server and messaging queue.88 including the minimum setup, plus the database server and messaging queue.
8889
=== modified file 'debian/maas-region-controller.postinst'
--- debian/maas-region-controller.postinst 2015-07-08 01:10:06 +0000
+++ debian/maas-region-controller.postinst 2015-07-13 15:10:25 +0000
@@ -169,6 +169,7 @@
169 db_get maas-region-controller/dbconfig-install169 db_get maas-region-controller/dbconfig-install
170 if [ "$RET" = "true" ]; then170 if [ "$RET" = "true" ]; then
171 maas_sync_migrate_db171 maas_sync_migrate_db
172 configure_migrate_maas_dns
172 fi173 fi
173174
174 # Display installation note175 # Display installation note

Subscribers

People subscribed via source and target branches

to all changes: