Compare commits

..

6 Commits

Author SHA1 Message Date
Tom Callaway 79ba39cd11 rebuild against gperftools 2012-02-16 21:36:29 -05:00
David Nalley f6bd21aaa2 fixing bug 773194 and updating to 0.39 in the process 2012-01-13 14:04:38 -05:00
David Nalley 07057e050a Merge branch 'f16' of ssh://pkgs.fedoraproject.org/ceph into origin/f16 2012-01-13 14:02:10 -05:00
David Nalley 18879ad313 complying with -static lib guidelines bz: 609700 2011-11-09 11:57:37 -05:00
Josef Bacik 0e4cc7c1b7 -forgot to add the logrotate patch 2011-11-07 12:00:43 -05:00
Josef Bacik 8cb6eae323 -updating ceph in f16 to 0.37 2011-11-07 11:54:54 -05:00
8 changed files with 169 additions and 930 deletions
+7 -2
View File
@@ -1,2 +1,7 @@
ceph-*.tar.*
*.src.rpm
ceph-0.20.tar.gz
/ceph-0.21.3.tar.gz
/ceph-0.25.1.tar.gz
/ceph-0.26.tar.gz
/ceph-0.31.tar.gz
/ceph-0.37.tar.gz
/ceph-0.39.tar.gz
-13
View File
@@ -1,13 +0,0 @@
--- ceph-0.80.5/src/perfglue/heap_profiler.cc.orig 2014-08-15 16:05:00.161794290 +0200
+++ ceph-0.80.5/src/perfglue/heap_profiler.cc 2014-08-15 16:05:04.691794305 +0200
@@ -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"
+17
View File
@@ -0,0 +1,17 @@
--- ceph-0.21.1/src/init-ceph.in.orig 2010-07-29 15:16:49.000000000 -0500
+++ ceph-0.21.1/src/init-ceph.in 2010-08-26 14:58:25.328581937 -0500
@@ -1,11 +1,11 @@
#!/bin/sh
# Start/stop ceph daemons
-# chkconfig: 2345 60 80
+# chkconfig: - 60 80
### BEGIN INIT INFO
# Provides: ceph
-# Default-Start: 2 3 4 5
-# Default-Stop: 0 1 6
+# Default-Start:
+# Default-Stop:
# Required-Start: $remote_fs $named $network $time
# Required-Stop: $remote_fs $named $network $time
# Short-Description: Start Ceph distributed file system daemons at boot time
-11
View File
@@ -1,11 +0,0 @@
--- ceph-0.80.5/src/test/Makefile.am.orig 2014-08-15 16:30:18.831799418 +0200
+++ ceph-0.80.5/src/test/Makefile.am 2014-08-15 16:23:17.758464663 +0200
@@ -642,7 +642,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
-40
View File
@@ -1,40 +0,0 @@
From 369daeeb447154016f774d16f1b618cdaaf575d5 Mon Sep 17 00:00:00 2001
From: Boris Ranto <branto@redhat.com>
Date: Fri, 31 Oct 2014 03:27:46 +0100
Subject: [PATCH] Remove systemd detection in ceph init script, rhbz#1157938
---
src/init-ceph.in | 10 +---------
1 file changed, 1 insertion(+), 9 deletions(-)
diff --git a/src/init-ceph.in b/src/init-ceph.in
index 95723b0..1effb56 100644
--- a/src/init-ceph.in
+++ b/src/init-ceph.in
@@ -44,10 +44,6 @@ test -f $LIBDIR/ceph_common.sh || exit 0
EXIT_STATUS=0
-# detect systemd
-SYSTEMD=0
-grep -qs systemd /proc/1/comm && SYSTEMD=1
-
signal_daemon() {
name=$1
daemon=$2
@@ -276,11 +272,7 @@ for name in $what; do
[ -n "$wrap" ] && runmode="-f &" && runarg="-f"
[ -n "$max_open_files" ] && files="ulimit -n $max_open_files;"
- if [ $SYSTEMD -eq 1 ]; then
- cmd="systemd-run -r bash -c '$files $cmd --cluster $cluster -f'"
- else
- cmd="$files $wrap $cmd --cluster $cluster $runmode"
- fi
+ cmd="$files $wrap $cmd --cluster $cluster $runmode"
if [ $dofsmount -eq 1 ] && [ -n "$fs_devs" ]; then
get_conf pre_mount "true" "pre mount command"
--
1.9.3
+11
View File
@@ -0,0 +1,11 @@
--- ./src/logrotate.conf.new 2012-01-11 18:23:10.597593501 -0500
+++ ./src/logrotate.conf 2012-01-11 18:23:26.808390838 -0500
@@ -4,7 +4,7 @@
compress
sharedscripts
postrotate
- invoke-rc.d ceph reload >/dev/null || service ceph reload >/dev/null
+ service ceph reload >/dev/null 2>/dev/null || true
endscript
missingok
}
+133 -863
View File
File diff suppressed because it is too large Load Diff
+1 -1
View File
@@ -1 +1 @@
c57f6887f6097f95ad2c3b169a94f811 ceph-0.80.5.tar.bz2
8dcc078604c54d10085b6990ef554738 ceph-0.39.tar.gz