Merge branch 'staging'

pkgs/tools/filesystems/ceph/0.80.nix

@@ -13,5 +13,6 @@ callPackage ./generic.nix (args // rec {
   patches = [
     ./0001-Cleanup-boost-optionals.patch
     ./fix-pgrefdebugging.patch
+    ./boost-158.patch
   ];
 })

pkgs/tools/filesystems/ceph/0.94.nix

@@ -10,5 +10,8 @@ callPackage ./generic.nix (args // rec {
     sha256 = "094f9knxgx8vb9fb1yzld9ib4m0wpqwqgqjl3xqf0dzm48nxqd73";
   };
 
-  patches = [ ./fix-pgrefdebugging.patch ];
+  patches = [
+    ./fix-pgrefdebugging.patch
+    ./boost-158.patch
+  ];
 })

pkgs/tools/filesystems/ceph/boost-158.patch

@@ -0,0 +1,27 @@
+From e7b196a4a091c0ea258866559ba06e7ed0cc4247 Mon Sep 17 00:00:00 2001
+From: Kefu Chai <kchai@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@redhat.com>
+---
+ src/mon/OSDMonitor.cc | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/src/mon/OSDMonitor.cc b/src/mon/OSDMonitor.cc
+index 73dcd5f..7caaa45 100644
+--- a/src/mon/OSDMonitor.cc
++++ b/src/mon/OSDMonitor.cc
+@@ -3174,8 +3174,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");