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

Proposed by Chris MacNaughton
Status: Merged
Merged at revision: b153d248b285dc20744111ef38cc278c76283166
Proposed branch: ~chris.macnaughton/ubuntu/+source/ceph:ubuntu/groovy
Merge into: ~ubuntu-server-dev/ubuntu/+source/ceph:ubuntu/groovy
Diff against target: 26 lines (+7/-0)
2 files modified
debian/changelog (+6/-0)
debian/control (+1/-0)
Reviewer Review Type Date Requested Status
James Page Approve
Review via email: mp+383332@code.launchpad.net
To post a comment you must log in.
Revision history for this message
James Page (james-page) :
review: Needs Fixing
Revision history for this message
James Page (james-page) :
review: Approve

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 5dbb657..d135132 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
1ceph (15.2.1-0ubuntu3) UNRELEASED; urgency=medium
2
3 * d/control: Add python3-yaml to the Ceph dashboard depends (LP: #1876325)
4
5 -- Chris MacNaughton <chris.macnaughton@canonical.com> Mon, 04 May 2020 12:04:03 +0200
6
1ceph (15.2.1-0ubuntu2) focal; urgency=medium7ceph (15.2.1-0ubuntu2) focal; urgency=medium
28
3 * Link with -pthread to fix FTBFS on riscv64.9 * Link with -pthread to fix FTBFS on riscv64.
diff --git a/debian/control b/debian/control
index fcaddb4..2adb666 100644
--- a/debian/control
+++ b/debian/control
@@ -295,6 +295,7 @@ Depends:
295 python3-openssl,295 python3-openssl,
296 python3-routes,296 python3-routes,
297 python3-werkzeug,297 python3-werkzeug,
298 python3-yaml,
298 ${misc:Depends},299 ${misc:Depends},
299 ${python3:Depends},300 ${python3:Depends},
300 ${shlibs:Depends},301 ${shlibs:Depends},

Subscribers

People subscribed via source and target branches