[Pkg-ceph-commits] [ceph] 06/09: Remove patch boost-1.58 applied upstream

Gaudenz Steinlin gaudenz at moszumanska.debian.org
Mon Dec 26 20:48:05 UTC 2016


This is an automated email from the git hooks/post-receive script.

gaudenz pushed a commit to tag debian/0.80.11-1
in repository ceph.

commit ee68c49504ec8ab0c6987669ea8fb959d992e4d0
Author: Gaudenz Steinlin <gaudenz at debian.org>
Date:   Thu Jan 14 22:13:22 2016 +0100

    Remove patch boost-1.58 applied upstream
---
 debian/patches/boost-1.58.patch | 28 ----------------------------
 debian/patches/series           |  1 -
 2 files changed, 29 deletions(-)

diff --git a/debian/patches/boost-1.58.patch b/debian/patches/boost-1.58.patch
deleted file mode 100644
index 4219579..0000000
--- a/debian/patches/boost-1.58.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 1d2af55f8c69b4a382eb516d8f90a8316fd3bc02 Mon Sep 17 00:00:00 2001
-From: Kefu Chai <kchai at redhat.com>
-Date: Fri, 8 May 2015 15:21:20 +0800
-Subject: [PATCH] mon: remove unused variable
-
-* as a side effect, this change silences
-  http://tracker.ceph.com/issues/11576
-
-Fixes: #11576
-Signed-off-by: Kefu Chai <kchai at redhat.com>
-(cherry picked from commit e7b196a4a091c0ea258866559ba06e7ed0cc4247)
----
- src/mon/OSDMonitor.cc | 2 --
- 1 file changed, 2 deletions(-)
-
-diff --git a/src/mon/OSDMonitor.cc b/src/mon/OSDMonitor.cc
-index 861fac8..9fac2c9 100644
---- a/src/mon/OSDMonitor.cc
-+++ b/src/mon/OSDMonitor.cc
-@@ -2481,8 +2481,6 @@ bool OSDMonitor::preprocess_command(MMonCommand *m)
-   } else if (prefix == "osd crush get-tunable") {
-     string tunable;
-     cmd_getval(g_ceph_context, cmdmap, "tunable", tunable);
--    int value;
--    cmd_getval(g_ceph_context, cmdmap, "value", value);
-     ostringstream rss;
-     if (f)
-       f->open_object_section("tunable");
diff --git a/debian/patches/series b/debian/patches/series
index 8188f00..e081369 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -13,7 +13,6 @@ bash-completion.patch
 rbdmap1-mount.patch
 rbdmap2-hooks.patch
 boost-1.57_1.patch
-boost-1.58.patch
 fix-build-without-libatomic-ops.patch
 
 ## Debian

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ceph/ceph.git



More information about the Pkg-ceph-commits mailing list