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
diff --git a/debian/changelog b/debian/changelog
index efdf605..40ad65c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
1ceph (12.2.12-0ubuntu0.18.04.2) UNRELEASED; urgency=medium1ceph (12.2.12-0ubuntu0.18.04.2) bionic; urgency=medium
22
3 [ James Page ]3 [ James Page ]
4 * d/p/ceph-volume-wait-for-lvs.patch: Cherry pick inflight fix to4 * d/p/ceph-volume-wait-for-lvs.patch: Cherry pick inflight fix to
@@ -10,6 +10,13 @@ ceph (12.2.12-0ubuntu0.18.04.2) UNRELEASED; urgency=medium
10 to civetweb to allow tuning of SOMAXCONN in Ceph RADOS Gateway10 to civetweb to allow tuning of SOMAXCONN in Ceph RADOS Gateway
11 deployments (LP: #1838109).11 deployments (LP: #1838109).
1212
13 [ Eric Desrochers ]
14 * d/rules: (LP: #1840347)
15 - "--no-restart-on-upgrade" is deprecated. Moving to alias
16 "--no-stop-on-upgrade" to also avoid confusion.
17 - Adding "--no-restart-after-upgrade" along with "--no-stop-on-upgrade".
18 - Dropping exclusion for ceph-[osd,mon,mds] using dh -X.
19
13 -- James Page <james.page@ubuntu.com> Wed, 03 Jul 2019 12:38:47 +010020 -- James Page <james.page@ubuntu.com> Wed, 03 Jul 2019 12:38:47 +0100
1421
15ceph (12.2.12-0ubuntu0.18.04.1) bionic; urgency=medium22ceph (12.2.12-0ubuntu0.18.04.1) bionic; urgency=medium
diff --git a/debian/rules b/debian/rules
index 154534b..1446fe5 100755
--- a/debian/rules
+++ b/debian/rules
@@ -132,7 +132,7 @@ override_dh_installinit:
132 # Enable systemd targets only132 # Enable systemd targets only
133 dh_systemd_enable -Xceph-mon.service -Xceph-osd.service -X ceph-mds.service133 dh_systemd_enable -Xceph-mon.service -Xceph-osd.service -X ceph-mds.service
134 # Start systemd targets only134 # Start systemd targets only
135 dh_systemd_start --no-restart-on-upgrade -Xceph-mon.service -Xceph-osd.service -X ceph-mds.service135 dh_systemd_start --no-stop-on-upgrade --no-restart-after-upgrade
136136
137override_dh_systemd_enable:137override_dh_systemd_enable:
138 # systemd enable done as part of dh_installinit138 # systemd enable done as part of dh_installinit

Subscribers

People subscribed via source and target branches