Merge lp:~andreserl/maas/packaging_makes_trusty_installable into lp:~maas-maintainers/maas/packaging

Proposed by Andres Rodriguez
Status: Merged
Approved by: Andres Rodriguez
Approved revision: 217
Merged at revision: 218
Proposed branch: lp:~andreserl/maas/packaging_makes_trusty_installable
Merge into: lp:~maas-maintainers/maas/packaging
Diff against target: 39 lines (+13/-3)
2 files modified
debian/changelog (+13/-1)
debian/maas-dns.postinst (+0/-2)
To merge this branch: bzr merge lp:~andreserl/maas/packaging_makes_trusty_installable
Reviewer Review Type Date Requested Status
Andres Rodriguez (community) Approve
Review via email: mp+201333@code.launchpad.net

Commit message

* Fix Changelog
* debian/maas-dns.postinst: Drop write_dns_config as this is run by
  celery jobs.
* debian/maas-region-controller.templates: Rename template to
  maas-region-controller-min.templates

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

Bump Revision

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 2014-01-03 10:19:34 +0000
3+++ debian/changelog 2014-01-13 13:32:16 +0000
4@@ -1,7 +1,19 @@
5-maas (1.4+bzr1805+dfsg-0ubuntu1) UNRELEASED; urgency=low
6+maas (1.4+bzr1814+dfsg-0ubuntu1) UNRELEASED; urgency=low
7
8 * UNRELEASED
9
10+ [ Andres Rodriguez ]
11+ * debian/maas-dns.postinst: Drop write_dns_config as this is run by
12+ celery jobs.
13+ * debian/maas-region-controller.templates: Rename template to
14+ maas-region-controller-min.templates
15+
16+ -- Andres Rodriguez <andreserl@ubuntu.com> Tue, 24 Dec 2013 14:07:14 -0500
17+
18+maas (1.4+bzr1789+dfsg-0ubuntu1) trusty; urgency=low
19+
20+ * New upstream release
21+
22 [ Jeroen Vermeulen ]
23 * Keep legacy import_ephemerals config for now.
24
25
26=== modified file 'debian/maas-dns.postinst'
27--- debian/maas-dns.postinst 2013-12-10 17:14:17 +0000
28+++ debian/maas-dns.postinst 2014-01-13 13:32:16 +0000
29@@ -28,8 +28,6 @@
30 sed -i '/^include\s.*maas/d' /etc/bind/named.conf.local
31 maas get_named_conf --edit --config_path /etc/bind/named.conf.local
32
33- maas write_dns_config
34-
35 invoke-rc.d bind9 restart || true
36 fi
37
38
39=== renamed file 'debian/maas-region-controller.templates' => 'debian/maas-region-controller-min.templates'

Subscribers

People subscribed via source and target branches

to all changes: