From: Nathan Cutler <ncutler@suse.com>
Date: Fri, 4 Aug 2017 16:58:27 +0000 (+0200)
Subject: Merge remote-tracking branch 'ceph/master' into ses5
X-Git-Tag: ses5-milestone10~3
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=88dc8cdc9d4af8ebd951220262a3df8ac3b8fbcf;p=ceph.git

Merge remote-tracking branch 'ceph/master' into ses5
---

88dc8cdc9d4af8ebd951220262a3df8ac3b8fbcf
diff --cc ceph.spec.in
index 5911ffc6390,35ce7add2fc..dfccf02a963
--- a/ceph.spec.in
+++ b/ceph.spec.in
@@@ -12,9 -13,9 +12,9 @@@
  # This file is under the GNU Lesser General Public License, version 2.1
  #
  # Please submit bugfixes or comments via http://tracker.ceph.com/
- # 
+ #
  %bcond_without ocf
 -%bcond_without cephfs_java
 +%bcond_with cephfs_java
  %if 0%{?suse_version}
  %bcond_with ceph_test_package
  %else