Rebase to latest stable upstream version

Version 9.2.0 - infernalis
Use upstream spec file (there was plenty of systemd/selinux changes)
This commit is contained in:
Boris Ranto 2015-11-10 17:50:04 +01:00
parent 3d553afe27
commit bcc7f226bb
3 changed files with 577 additions and 221 deletions

View File

@ -1,30 +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");
--
2.5.0

764
ceph.spec

File diff suppressed because it is too large Load Diff

View File

@ -1 +1 @@
e7c35581f8d36d34f7cde16a862e54fb ceph-0.94.5.tar.bz2 f70361c9088e13962af295819c900445 ceph-9.2.0.tar.bz2