Merge ~chris.macnaughton/ubuntu/+source/ceph:groovy/bug/1892448 into ~ubuntu-server-dev/ubuntu/+source/ceph:ubuntu/groovy

Proposed by Chris MacNaughton
Status: Merged
Merge reported by: James Page
Merged at revision: f6d58fba948f698dc07d242042e7eb171d5f4b41
Proposed branch: ~chris.macnaughton/ubuntu/+source/ceph:groovy/bug/1892448
Merge into: ~ubuntu-server-dev/ubuntu/+source/ceph:ubuntu/groovy
Diff against target: 30 lines (+6/-3)
2 files modified
debian/ceph-base.install (+0/-1)
debian/changelog (+6/-2)
Reviewer Review Type Date Requested Status
James Page Pending
Ubuntu Server Developers Pending
Review via email: mp+389847@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/ceph-base.install b/debian/ceph-base.install
index f1d9859..9265be8 100644
--- a/debian/ceph-base.install
+++ b/debian/ceph-base.install
@@ -12,7 +12,6 @@ usr/lib/ceph/ceph_common.sh
12usr/sbin/ceph-create-keys12usr/sbin/ceph-create-keys
13usr/share/doc/ceph/sample.ceph.conf13usr/share/doc/ceph/sample.ceph.conf
14usr/share/man/man8/ceph-create-keys.814usr/share/man/man8/ceph-create-keys.8
15usr/share/man/man8/ceph-deploy.8
16usr/share/man/man8/ceph-kvstore-tool.815usr/share/man/man8/ceph-kvstore-tool.8
17usr/share/man/man8/ceph-run.816usr/share/man/man8/ceph-run.8
18usr/share/man/man8/crushtool.817usr/share/man/man8/crushtool.8
diff --git a/debian/changelog b/debian/changelog
index 330f15d..83e5ebd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,12 @@
1ceph (15.2.3-0ubuntu4) UNRELEASED; urgency=medium1ceph (15.2.3-0ubuntu5) UNRELEASED; urgency=medium
22
3 [ Corey Bryant ]
3 * d/control: Remove Breaks/Replaces that are older than Focal (LP: #1878419).4 * d/control: Remove Breaks/Replaces that are older than Focal (LP: #1878419).
45
5 -- Corey Bryant <corey.bryant@canonical.com> Thu, 20 Aug 2020 13:49:40 -04006 [ Chris MacNaughton ]
7 * d/ceph-base.install: Remove ceph-deploy man page installation (LP: #1892448).
8
9 -- Chris MacNaughton <chris.macnaughton@canonical.com> Wed, 26 Aug 2020 12:49:27 +0000
610
7ceph (15.2.3-0ubuntu3) groovy; urgency=medium11ceph (15.2.3-0ubuntu3) groovy; urgency=medium
812

Subscribers

People subscribed via source and target branches