[Pkg-ceph-commits] [ceph] 04/12: Add upstream patch to fix compiling with boost 1.58

[Gaudenz Steinlin]

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

gaudenz pushed a commit to branch master
in repository ceph.

commit c8b478a038cd879f0088a5a462d98495f9257c2e
Author: Gaudenz Steinlin <gaudenz at debian.org>
Date:   Tue Oct 6 14:37:06 2015 +0200

    Add upstream patch to fix compiling with boost 1.58
    
    Closes: #795178
---
 debian/patches/boost-1.58.patch | 28 ++++++++++++++++++++++++++++
 debian/patches/series           |  1 +
 2 files changed, 29 insertions(+)

diff --git a/debian/patches/boost-1.58.patch b/debian/patches/boost-1.58.patch
new file mode 100644
index 0000000..4219579
--- /dev/null
+++ b/debian/patches/boost-1.58.patch
@@ -0,0 +1,28 @@
+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 7a423c8..d7ca3d4 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -12,6 +12,7 @@ backfill-prio.patch
 bash-completion.patch
 rbdmap1-mount.patch
 rbdmap2-hooks.patch
+boost-1.58.patch
 
 ## Debian
 rbdmap3-lazyumount.patch

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