Merge lp:~andreserl/maas/2.0a1_packaging_fixes into lp:~maas-maintainers/maas/packaging

Proposed by Andres Rodriguez
Status: Merged
Approved by: Andres Rodriguez
Approved revision: 450
Merged at revision: 450
Proposed branch: lp:~andreserl/maas/2.0a1_packaging_fixes
Merge into: lp:~maas-maintainers/maas/packaging
Diff against target: 41 lines (+11/-4)
2 files modified
debian/changelog (+9/-2)
debian/maas-region-controller.postinst (+2/-2)
To merge this branch: bzr merge lp:~andreserl/maas/2.0a1_packaging_fixes
Reviewer Review Type Date Requested Status
Andres Rodriguez (community) Approve
Review via email: mp+288219@code.launchpad.net

Commit message

Packaging updates.

To post a comment you must log in.
Revision history for this message
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 2016-03-03 16:20:12 +0000
3+++ debian/changelog 2016-03-06 16:55:14 +0000
4@@ -1,10 +1,17 @@
5-maas (2.0.0~alpha1+bzr4722-0ubuntu1) UNRELEASED; urgency=medium
6+maas (2.0.0~alpha1+bzr4736-0ubuntu1~xenial2) xenial; urgency=medium
7
8- * New usptream release, 2.0.0 bzr 4682.
9+ * New usptream release, 2.0.0 bzr 4736:
10+ - Deprecate Cluster Controllers in favor of Rack Controllers.
11+ - Deprecate API 1.0 in favor if API 2.0.
12+ - DHCP & Rack Controller High Availability.
13+ - Networking - IP Ranges.
14+ - Networking - DNS.
15+ - BMC Model.
16 * Rename maas-cluster* to maas-rack* and handle the upgrade path.
17 * Fix installation of init scripts and daemon systemd units.
18 * Allow 'dhcpd' to access /usr/sbin/maas-provision via
19 sudoers file (LP: #1552775)
20+ * debian/extras/maas: Replace shell wrapper with python. (LP: #1553605)
21
22 -- Andres Rodriguez <andreserl@ubuntu.com> Mon, 01 Feb 2016 18:18:52 +0100
23
24
25=== modified file 'debian/maas-region-controller.postinst'
26--- debian/maas-region-controller.postinst 2016-02-10 15:56:10 +0000
27+++ debian/maas-region-controller.postinst 2016-03-06 16:55:14 +0000
28@@ -149,11 +149,11 @@
29 fi
30
31 systemctl enable maas-regiond >/dev/null || true
32-invoke-rc.d maas-regiond restart || true
33+systemctl restart maas-regiond >/dev/null || true
34 invoke-rc.d apache2 restart || true
35
36 if [ -f /lib/systemd/system/maas-rackd.service ]; then
37- invoke-rc.d maas-rackd restart || true
38+ systemctl restart maas-rackd >/dev/null || true
39 fi
40
41 db_stop

Subscribers

People subscribed via source and target branches

to all changes: