Compare commits

..

18 Commits

Author SHA1 Message Date
Kaleb S. KEITHLEY 40180d61e7 outdated version, no longer supported on el6, obsoleted by packages for el7 in CentOS Storage SIG 2017-11-21 15:10:14 -05:00
Dan Horák 8d7cd94689 - update Requires for s390(x) 2014-09-09 10:17:27 +02:00
Boris Ranto ae54f50589 Fix bz 1136811 (incorrect symlink on fedora) 2014-09-03 15:39:01 +02:00
Boris Ranto d5d844e547 Second attempt to fix selinux issue (bz 1118504) 2014-08-22 02:06:13 +02:00
Kalev Lember e54974a235 Obsolete ceph-libcephfs
Correct the name of the obsoleted package. It used to be called
"ceph-libcephfs" and not "libcephfs".

Transaction check error:
file /usr/lib64/libcephfs.so.1.0.0 from install of
libcephfs1-1:0.80.5-5.fc21.x86_64 conflicts with file from package
ceph-libcephfs-0.81.0-6.fc21.x86_64
2014-08-17 14:01:14 +02:00
Boris Ranto 0f382eb9c9 Merge branch 'master' into el6 2014-08-16 16:16:09 +02:00
Boris Ranto b81df99ea4 Merge branch 'master' into el6 2014-08-16 11:20:10 +02:00
Kaleb S. KEITHLEY 454fb3d60d Merge remote-tracking branch 'origin' into el6 2014-07-07 08:31:43 -04:00
Kaleb S. KEITHLEY 897c4bbb15 Merge remote-tracking branch 'origin' into el6 2014-07-04 12:56:37 -04:00
Kaleb S. KEITHLEY dc4aea2520 ceph-0.81.0 2014-06-05 02:57:32 -04:00
Kaleb S. KEITHLEY e2514bc7b0 ceph-0.81.0 2014-06-05 02:44:21 -04:00
Kaleb S. KEITHLEY 768e30a6d6 Merge remote-tracking branch 'origin' into el6 2014-06-05 02:32:18 -04:00
Kaleb S. KEITHLEY 38d866465a Merge remote-tracking branch 'origin' into el6 2014-05-14 10:57:43 -04:00
Kaleb S. KEITHLEY 4e33e003a1 Merge remote-tracking branch 'origin' into el6 2014-05-13 21:02:23 -04:00
Josef Bacik bb9f0b064d - fix a sample.conf problem 2013-10-07 12:30:00 +02:00
Dan Horák a7086b93e9 Merge branch 'master' into el6 2013-10-07 12:11:10 +02:00
Josef Bacik d2d8b52247 Merge branch 'master' into el6 2013-09-11 16:13:54 -04:00
Josef Bacik da844afb90 - fix some configure breakage with gperftools and pthread 2013-07-30 13:53:05 -04:00
7 changed files with 1 additions and 1257 deletions
-2
View File
@@ -1,2 +0,0 @@
ceph-*.tar.*
*.src.rpm
@@ -1,27 +0,0 @@
From 6c280200b42758d3e84cfd1a5b256171cab132d1 Mon Sep 17 00:00:00 2001
From: Boris Ranto <branto@redhat.com>
Date: Wed, 14 Jan 2015 07:46:56 +0100
Subject: [PATCH 1/3] gperftools deprecated google/* includes
---
src/perfglue/heap_profiler.cc | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/perfglue/heap_profiler.cc b/src/perfglue/heap_profiler.cc
index 6b079b8..cdd5ccb 100644
--- a/src/perfglue/heap_profiler.cc
+++ b/src/perfglue/heap_profiler.cc
@@ -12,8 +12,8 @@
*
*/
-#include <google/heap-profiler.h>
-#include <google/malloc_extension.h>
+#include <gperftools/heap-profiler.h>
+#include <gperftools/malloc_extension.h>
#include "heap_profiler.h"
#include "common/environment.h"
#include "common/LogClient.h"
--
1.9.3
@@ -1,25 +0,0 @@
From 213613337d56bf1b1257f043c7b737ee86b0e1be Mon Sep 17 00:00:00 2001
From: Boris Ranto <branto@redhat.com>
Date: Wed, 14 Jan 2015 07:47:47 +0100
Subject: [PATCH 2/3] -Wno-format causes compiler options collision
---
src/test/Makefile.am | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/test/Makefile.am b/src/test/Makefile.am
index 69f9e84..9ede275 100644
--- a/src/test/Makefile.am
+++ b/src/test/Makefile.am
@@ -646,7 +646,7 @@ bin_DEBUGPROGRAMS += ceph_test_librbd
if LINUX
ceph_test_librbd_fsx_SOURCES = test/librbd/fsx.c
ceph_test_librbd_fsx_LDADD = $(LIBRBD) $(LIBRADOS) -lm
-ceph_test_librbd_fsx_CFLAGS = ${AM_CFLAGS} -Wno-format
+ceph_test_librbd_fsx_CFLAGS = ${AM_CFLAGS}
bin_DEBUGPROGRAMS += ceph_test_librbd_fsx
endif
--
1.9.3
@@ -1,27 +0,0 @@
From 149481ac6dc52a852fb53800384a99e3d69ad11a Mon Sep 17 00:00:00 2001
From: Boris Ranto <branto@redhat.com>
Date: Mon, 8 Dec 2014 08:36:37 +0100
Subject: [PATCH 3/3] Backport pull request #2937 to firefly
---
src/common/RWLock.h | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/src/common/RWLock.h b/src/common/RWLock.h
index f901ac0..f4d1937 100644
--- a/src/common/RWLock.h
+++ b/src/common/RWLock.h
@@ -36,7 +36,9 @@ public:
}
virtual ~RWLock() {
- pthread_rwlock_unlock(&L);
+ // The following check is racy but we are about to destroy
+ // the object and we assume that there are no other users.
+ //assert(!is_locked()); -- hacky backport, no is_locked in firefly
pthread_rwlock_destroy(&L);
}
--
1.9.3
-1175
View File
File diff suppressed because it is too large Load Diff
+1
View File
@@ -0,0 +1 @@
outdated version, no longer supported on el6, obsoleted by packages for el7 in CentOS Storage SIG
-1
View File
@@ -1 +0,0 @@
cdb6309db1e923ab291bee908cd33f16 ceph-0.80.9.tar.bz2