Merge ~slashd/ubuntu/+source/ceph:bioniclp1840347 into ~ubuntu-server-dev/ubuntu/+source/ceph:ubuntu/bionic

Proposed by Eric Desrochers on 2019-08-27
Status: Merged
Merged at revision: f662a72807ae6b75f305067524c0383e31a95a0b
Proposed branch: ~slashd/ubuntu/+source/ceph:bioniclp1840347
Merge into: ~ubuntu-server-dev/ubuntu/+source/ceph:ubuntu/bionic
Diff against target: 37 lines (+9/-2)
2 files modified
debian/changelog (+8/-1)
debian/rules (+1/-1)
Reviewer Review Type Date Requested Status
Corey Bryant 2019-08-27 Pending
James Page 2019-08-27 Pending
Review via email: mp+371887@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 efdf605..40ad65c 100644
3--- a/debian/changelog
4+++ b/debian/changelog
5@@ -1,4 +1,4 @@
6-ceph (12.2.12-0ubuntu0.18.04.2) UNRELEASED; urgency=medium
7+ceph (12.2.12-0ubuntu0.18.04.2) bionic; urgency=medium
8
9 [ James Page ]
10 * d/p/ceph-volume-wait-for-lvs.patch: Cherry pick inflight fix to
11@@ -10,6 +10,13 @@ ceph (12.2.12-0ubuntu0.18.04.2) UNRELEASED; urgency=medium
12 to civetweb to allow tuning of SOMAXCONN in Ceph RADOS Gateway
13 deployments (LP: #1838109).
14
15+ [ Eric Desrochers ]
16+ * d/rules: (LP: #1840347)
17+ - "--no-restart-on-upgrade" is deprecated. Moving to alias
18+ "--no-stop-on-upgrade" to also avoid confusion.
19+ - Adding "--no-restart-after-upgrade" along with "--no-stop-on-upgrade".
20+ - Dropping exclusion for ceph-[osd,mon,mds] using dh -X.
21+
22 -- James Page <james.page@ubuntu.com> Wed, 03 Jul 2019 12:38:47 +0100
23
24 ceph (12.2.12-0ubuntu0.18.04.1) bionic; urgency=medium
25diff --git a/debian/rules b/debian/rules
26index 154534b..1446fe5 100755
27--- a/debian/rules
28+++ b/debian/rules
29@@ -132,7 +132,7 @@ override_dh_installinit:
30 # Enable systemd targets only
31 dh_systemd_enable -Xceph-mon.service -Xceph-osd.service -X ceph-mds.service
32 # Start systemd targets only
33- dh_systemd_start --no-restart-on-upgrade -Xceph-mon.service -Xceph-osd.service -X ceph-mds.service
34+ dh_systemd_start --no-stop-on-upgrade --no-restart-after-upgrade
35
36 override_dh_systemd_enable:
37 # systemd enable done as part of dh_installinit

Subscribers

People subscribed via source and target branches