diff options
author | Vladimír Čunát <vcunat@gmail.com> | 2016-02-03 16:54:03 +0100 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2016-02-03 16:57:19 +0100 |
commit | ae74c356d94b795eb07dfe9978788b49b70f5959 (patch) | |
tree | c13c6894b75f95d3a4dc4627efef508bb03dfba8 /pkgs/tools/filesystems/ceph/boost-158.patch | |
parent | c9790126312119ce5a2a8ac946d9f086e7ea9f55 (diff) | |
parent | 53e0f8b1cdf36574bfede6e62e2ac2739c3ef804 (diff) | |
download | nixlib-ae74c356d94b795eb07dfe9978788b49b70f5959.tar nixlib-ae74c356d94b795eb07dfe9978788b49b70f5959.tar.gz nixlib-ae74c356d94b795eb07dfe9978788b49b70f5959.tar.bz2 nixlib-ae74c356d94b795eb07dfe9978788b49b70f5959.tar.lz nixlib-ae74c356d94b795eb07dfe9978788b49b70f5959.tar.xz nixlib-ae74c356d94b795eb07dfe9978788b49b70f5959.tar.zst nixlib-ae74c356d94b795eb07dfe9978788b49b70f5959.zip |
Merge recent 'staging' into closure-size
Let's get rid of those merge conflicts.
Diffstat (limited to 'pkgs/tools/filesystems/ceph/boost-158.patch')
-rw-r--r-- | pkgs/tools/filesystems/ceph/boost-158.patch | 27 |
1 files changed, 0 insertions, 27 deletions
diff --git a/pkgs/tools/filesystems/ceph/boost-158.patch b/pkgs/tools/filesystems/ceph/boost-158.patch deleted file mode 100644 index 11a1d55c4948..000000000000 --- a/pkgs/tools/filesystems/ceph/boost-158.patch +++ /dev/null @@ -1,27 +0,0 @@ -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"); |