Rebase to version 0.94.6

0002-init-ceph.in-Allow-custom-cluster-names-during-start.patch

@@ -5,24 +5,13 @@ Subject: [PATCH] init-ceph.in: Allow custom cluster names during startup.
 
 Signed-off-by: Richard Chan <richard@treeboxsolutions.com>
 ---
- src/init-ceph.in | 10 +++++++---
- 1 file changed, 7 insertions(+), 3 deletions(-)
+ src/init-ceph.in | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
 
 diff --git a/src/init-ceph.in b/src/init-ceph.in
 index 2ff98c7..245068a 100644
 --- a/src/init-ceph.in
 +++ b/src/init-ceph.in
-@@ -117,6 +117,10 @@ dofsumount=0
- verbose=0
- use_default_conf=1
- 
-+## set variables like cluster or conf
-+[ -e /etc/sysconfig/ceph ] && . /etc/sysconfig/ceph
-+[ -e /etc/default/ceph ] && . /etc/default/ceph
-+
- 
- while echo $1 | grep -q '^-'; do     # FIXME: why not '^-'?
- case $1 in
 @@ -282,7 +286,7 @@ for name in $what; do
  	lockfile=""
      fi

ceph.spec

@@ -11,14 +11,14 @@
 # common
 #################################################################################
 Name:		ceph
-Version:	0.94.5
-Release:	2%{?dist}
+Version:	0.94.6
+Release:	1%{?dist}
 Epoch:		1
 Summary:	User space components of the Ceph file system
 License:	GPLv2
 Group:		System Environment/Base
 URL:		http://ceph.com/
-Source0:	http://ceph.com/download/%{name}-%{version}.tar.bz2
+Source0:	http://ceph.com/download/%{name}-%{version}.tar.gz
 %if 0%{?fedora} || 0%{?centos} || 0%{?rhel}
 Patch0000:	init-ceph.in-fedora.patch
 %endif
@@ -935,6 +935,9 @@ ln -sf %{_libdir}/librbd.so.1 /usr/lib64/qemu/librbd.so.1
 # actually build this meta package.
 
 %changelog
+* Tue Feb 23 2016 Boris Ranto <branto@redhat.com> - 0.94.6-1
+- Rebase to version 0.94.6
+
 * Wed Dec 09 2015 Boris Ranto <branto@redhat.com> - 1:0.94.5-2
 - Allow setting custom cluster names in init script (#1269436)
 

sources

@@ -1 +1,2 @@
 e7c35581f8d36d34f7cde16a862e54fb  ceph-0.94.5.tar.bz2
+566cdeae80ee639dcb265ac284a59b48  ceph-0.94.6.tar.gz