Merge ~slashd/ubuntu/+source/ceph:discolp1840347 into ~ubuntu-server-dev/ubuntu/+source/ceph:ubuntu/disco

Proposed by Eric Desrochers on 2019-08-21
Status: Merged
Merged at revision: 4ed6f0a15d53b0fae6110eb43ddb1c8bb1ec3c72
Proposed branch: ~slashd/ubuntu/+source/ceph:discolp1840347
Merge into: ~ubuntu-server-dev/ubuntu/+source/ceph:ubuntu/disco
Diff against target: 31 lines (+11/-1)
2 files modified
debian/changelog (+10/-0)
debian/rules (+1/-1)
Reviewer Review Type Date Requested Status
Corey Bryant 2019-08-27 Pending
James Page 2019-08-21 Pending
Review via email: mp+371551@code.launchpad.net
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
1diff --git a/debian/changelog b/debian/changelog
2index c828c32..3f914dd 100644
3--- a/debian/changelog
4+++ b/debian/changelog
5@@ -1,3 +1,13 @@
6+ceph (13.2.6-0ubuntu0.19.04.3) disco; urgency=medium
7+
8+ * d/rules: (LP: #1840347)
9+ - "--no-restart-on-upgrade" is deprecated. Moving to alias
10+ "--no-stop-on-upgrade" to also avoid confusion.
11+ - Adding "--no-restart-after-upgrade" along with "--no-stop-on-upgrade".
12+ - Dropping exclusion for ceph-[osd,mon,mds] using dh -X.
13+
14+ -- Eric Desrochers <eric.desrochers@canonical.com> Tue, 20 Aug 2019 20:21:13 -0400
15+
16 ceph (13.2.6-0ubuntu0.19.04.2) disco; urgency=medium
17
18 * d/p/bug1832105.patch: Cherry pick fix to avoid cython interpreter
19diff --git a/debian/rules b/debian/rules
20index 4696b9d..6291cc8 100755
21--- a/debian/rules
22+++ b/debian/rules
23@@ -89,7 +89,7 @@ override_dh_installinit:
24 # Enable systemd targets only
25 dh_systemd_enable -Xceph-mon.service -Xceph-osd.service -X ceph-mds.service
26 # Start systemd targets only
27- dh_systemd_start --no-restart-on-upgrade -Xceph-mon.service -Xceph-osd.service -X ceph-mds.service
28+ dh_systemd_start --no-stop-on-upgrade --no-restart-after-upgrade
29
30 override_dh_systemd_enable:
31 # systemd enable done as part of dh_installinit

Subscribers

People subscribed via source and target branches