+++ This bug was initially created as a clone of Bug #819130 +++ I'll be merging in the spec changes from Fedora. This should be used for 3.1, 3.2 and 3.3. --- Additional comment from Vijay Bellur on 2013-02-17 22:32:16 EST --- CHANGE: http://review.gluster.org/4454 (glusterfs.spec.in: resync with Fedora glusterfs.spec) merged in master by Anand Avati (avati) --- Additional comment from Vijay Bellur on 2013-02-18 01:50:32 EST --- CHANGE: http://review.gluster.org/4532 (LinuxRPM/Makefile: fix backquote which was triggering recursive make) merged in master by Anand Avati (avati) --- Additional comment from Vijay Bellur on 2013-02-19 13:21:25 EST --- CHANGE: http://review.gluster.org/4547 (glusterfs.spec.in: resync with Fedora glusterfs.spec) merged in master by Anand Avati (avati) --- Additional comment from Vijay Bellur on 2013-03-22 14:55:24 EDT --- CHANGE: http://review.gluster.org/4674 (glusterfs.spec.in: sync with fedora glusterfs.spec) merged in master by Anand Avati (avati) --- Additional comment from Vijay Bellur on 2013-03-26 15:04:52 EDT --- REVIEW: http://review.gluster.org/4724 (glusterfs.spec.in: resync with Fedora glusterfs.spec) posted (#1) for review on master by Kaleb KEITHLEY (kkeithle) --- Additional comment from Vijay Bellur on 2013-03-26 15:32:48 EDT --- REVIEW: http://review.gluster.org/4725 (glusterfs.spec.in: resync with Fedora glusterfs.spec) posted (#1) for review on release-3.4 by Kaleb KEITHLEY (kkeithle) --- Additional comment from Vijay Bellur on 2013-03-26 21:29:17 EDT --- COMMIT: http://review.gluster.org/4725 committed in release-3.4 by Anand Avati (avati) ------ commit 87d03fa7f48af6500cb8277db96ee7f6c690ea1c Author: Krishnan Parthasarathi <kparthas> Date: Wed Feb 27 17:55:47 2013 +0530 glusterd: Removed fd leaks in glusterfs_start utility function PROBLEM: The FILE* associated with the pidfile was leaked if pmap_registry_search on the brickinfo' path failed. FIX: Eliminates the use of the FILE* that was leaked. Uses glusterd_is_service_running utility function in place of the earlier attempt to check for the same. Change-Id: I94082bd5a94b8a6340f8cc11726d3264e364efe6 BUG: 916549 Signed-off-by: Krishnan Parthasarathi <kparthas> Reviewed-on: http://review.gluster.org/4596 Tested-by: Gluster Build System <jenkins.com> Reviewed-by: Jeff Darcy <jdarcy> Reviewed-by: Anand Avati <avati> --- Additional comment from Vijay Bellur on 2013-03-28 11:43:13 EDT --- REVIEW: http://review.gluster.org/4742 (glusterfs.spec.in: sync with fedora glusterfs.spec) posted (#1) for review on master by Kaleb KEITHLEY (kkeithle) --- Additional comment from Vijay Bellur on 2013-03-28 11:58:16 EDT --- REVIEW: http://review.gluster.org/4743 (glusterfs.spec.in: sync with fedora glusterfs.spec) posted (#1) for review on release-3.4 by Kaleb KEITHLEY (kkeithle) --- Additional comment from Vijay Bellur on 2013-03-28 17:28:29 EDT --- COMMIT: http://review.gluster.org/4742 committed in master by Anand Avati (avati) ------ commit 2cd9b31a5f032af807dea7b3d1b40592444154b5 Author: Kaleb S. KEITHLEY <kkeithle> Date: Thu Mar 28 11:41:25 2013 -0400 glusterfs.spec.in: sync with fedora glusterfs.spec add --without ufo Change-Id: If1b77003ded537f9664fa6ad677d48d118516c64 Signed-off-by: Kaleb S. KEITHLEY <kkeithle> BUG: 819130 Reviewed-on: http://review.gluster.org/4742 Tested-by: Gluster Build System <jenkins.com> Tested-by: Luis Pabon <lpabon> Reviewed-by: Luis Pabon <lpabon> Reviewed-by: Anand Avati <avati> --- Additional comment from Vijay Bellur on 2013-03-28 17:28:51 EDT --- COMMIT: http://review.gluster.org/4743 committed in release-3.4 by Anand Avati (avati) ------ commit 2cd9b31a5f032af807dea7b3d1b40592444154b5 Author: Kaleb S. KEITHLEY <kkeithle> Date: Thu Mar 28 11:41:25 2013 -0400 glusterfs.spec.in: sync with fedora glusterfs.spec add --without ufo Change-Id: If1b77003ded537f9664fa6ad677d48d118516c64 Signed-off-by: Kaleb S. KEITHLEY <kkeithle> BUG: 819130 Reviewed-on: http://review.gluster.org/4742 Tested-by: Gluster Build System <jenkins.com> Tested-by: Luis Pabon <lpabon> Reviewed-by: Luis Pabon <lpabon> Reviewed-by: Anand Avati <avati> --- Additional comment from Kaleb KEITHLEY on 2013-04-01 10:52:40 EDT --- merged (cherry pick) from master to release-3.4
REVIEW: http://review.gluster.org/4804 (build: add BuildRequires librdmacm-devel) posted (#1) for review on master by Kaleb KEITHLEY (kkeithle)
REVIEW: http://review.gluster.org/4804 (build: add BuildRequires librdmacm-devel) posted (#2) for review on master by Kaleb KEITHLEY (kkeithle)
COMMIT: http://review.gluster.org/4804 committed in master by Anand Avati (avati) ------ commit 2fbae10cc026c3a0dab82fdb47497f42f5683934 Author: Kaleb S. KEITHLEY <kkeithle> Date: Wed Apr 10 15:08:51 2013 -0400 build: add BuildRequires librdmacm-devel See http://review.gluster.org/149 Installed librdmacm-devel RPM on the build server. Change-Id: Iafb30e9cf1b15272b80329cc6141c7e92b43daee BUG: 950083 Signed-off-by: Kaleb S. KEITHLEY <kkeithle> Reviewed-on: http://review.gluster.org/4804 Tested-by: Gluster Build System <jenkins.com> Reviewed-by: Jeff Darcy <jdarcy>
REVIEW: http://review.gluster.org/4876 (build: sync glusterfs.spec.in with Fedora glusterfs.spec) posted (#1) for review on master by Kaleb KEITHLEY (kkeithle)
REVIEW: http://review.gluster.org/4877 (build: sync glusterfs.spec.in with Fedora glusterfs.spec) posted (#1) for review on release-3.4 by Kaleb KEITHLEY (kkeithle)
REVIEW: http://review.gluster.org/4876 (build: sync glusterfs.spec.in with Fedora glusterfs.spec) posted (#2) for review on master by Kaleb KEITHLEY (kkeithle)
REVIEW: http://review.gluster.org/4876 (build: sync glusterfs.spec.in with Fedora glusterfs.spec) posted (#3) for review on master by Kaleb KEITHLEY (kkeithle)
REVIEW: http://review.gluster.org/4876 (build: sync glusterfs.spec.in with Fedora glusterfs.spec) posted (#4) for review on master by Kaleb KEITHLEY (kkeithle)
REVIEW: http://review.gluster.org/4876 (build: sync glusterfs.spec.in with Fedora glusterfs.spec) posted (#5) for review on master by Kaleb KEITHLEY (kkeithle)
REVIEW: http://review.gluster.org/4876 (build: sync glusterfs.spec.in with Fedora glusterfs.spec) posted (#6) for review on master by Kaleb KEITHLEY (kkeithle)
REVIEW: http://review.gluster.org/4876 (build: sync glusterfs.spec.in with Fedora glusterfs.spec) posted (#7) for review on master by Kaleb KEITHLEY (kkeithle)
REVIEW: http://review.gluster.org/4876 (build: sync glusterfs.spec.in with Fedora glusterfs.spec) posted (#8) for review on master by Kaleb KEITHLEY (kkeithle)
REVIEW: http://review.gluster.org/4876 (build: sync glusterfs.spec.in with Fedora glusterfs.spec) posted (#9) for review on master by Kaleb KEITHLEY (kkeithle)
REVIEW: http://review.gluster.org/4876 (build: sync glusterfs.spec.in with Fedora glusterfs.spec) posted (#10) for review on master by Kaleb KEITHLEY (kkeithle)
REVIEW: http://review.gluster.org/4876 (build: sync glusterfs.spec.in with Fedora glusterfs.spec) posted (#11) for review on master by Kaleb KEITHLEY (kkeithle)
REVIEW: http://review.gluster.org/4876 (build: sync glusterfs.spec.in with Fedora glusterfs.spec) posted (#12) for review on master by Kaleb KEITHLEY (kkeithle)
COMMIT: http://review.gluster.org/4876 committed in master by Vijay Bellur (vbellur) ------ commit 5e0116109e3c444b11adb9809c75b4da72e85457 Author: Kaleb S. KEITHLEY <kkeithle> Date: Tue Apr 23 12:57:40 2013 -0400 build: sync glusterfs.spec.in with Fedora glusterfs.spec BUG: 950083 Change-Id: I96aeb8fbe8b79bbc058ff9a45167d822abb576ed Signed-off-by: Kaleb S. KEITHLEY <kkeithle> Reviewed-on: http://review.gluster.org/4876 Tested-by: Gluster Build System <jenkins.com> Reviewed-by: Niels de Vos <ndevos>
REVIEW: http://review.gluster.org/5180 (build: sync glusterfs.spec.in with Fedora glusterfs.spec) posted (#1) for review on master by Kaleb KEITHLEY (kkeithle)
REVIEW: http://review.gluster.org/5180 (build: sync glusterfs.spec.in with Fedora glusterfs.spec) posted (#2) for review on master by Kaleb KEITHLEY (kkeithle)
REVIEW: http://review.gluster.org/5180 (build: sync glusterfs.spec.in with Fedora glusterfs.spec) posted (#3) for review on master by Kaleb KEITHLEY (kkeithle)
REVIEW: http://review.gluster.org/5230 ( build: sync glusterfs.spec.in with Fedora glusterfs.spec) posted (#1) for review on master by Kaleb KEITHLEY (kkeithle)
REVIEW: http://review.gluster.org/5230 (build: sync glusterfs.spec.in with Fedora glusterfs.spec) posted (#2) for review on master by Kaleb KEITHLEY (kkeithle)
REVIEW: http://review.gluster.org/5230 (build: sync glusterfs.spec.in with Fedora glusterfs.spec) posted (#3) for review on master by Kaleb KEITHLEY (kkeithle)
*** Bug 954190 has been marked as a duplicate of this bug. ***
REVIEW: http://review.gluster.org/5230 (build: sync glusterfs.spec.in with Fedora glusterfs.spec) posted (#4) for review on master by Kaleb KEITHLEY (kkeithle)
REVIEW: http://review.gluster.org/5230 (build: sync glusterfs.spec.in with Fedora glusterfs.spec) posted (#5) for review on master by Kaleb KEITHLEY (kkeithle)
COMMIT: http://review.gluster.org/5230 committed in master by Vijay Bellur (vbellur) ------ commit f7b1245ca221fd7d4cee626ae358a2ebc933ffdd Author: Kaleb S. KEITHLEY <kkeithle> Date: Mon Jun 17 13:44:10 2013 -0400 build: sync glusterfs.spec.in with Fedora glusterfs.spec * add glusterfs-api and glusterfs-api-devel sub-packages * add extras/systemd/glusterd.service. Use it (or extras/init.d/glusterd) instead of the Fedora versions. * restores ability to build glusterfs RPMs from the dist tarball with 'rpmbuild {-ts,-tb,-ta} glusterfs-XXX.tar.gz' * other minor cleanups mostly to sync with fedora .spec and to build from the dist tarball. Any differences will be resolved in the fedora .spec in the next release (i.e. beta4 or GA). (still considering whether to add fedora glusterfsd.{init,service} files to glusterfs or remove them from fedora.) BUG: 950083 Change-Id: Ibda3cd57b24ef5c2a27446703e718e5044ec546c Signed-off-by: Kaleb S. KEITHLEY <kkeithle> Reviewed-on: http://review.gluster.org/5230 Tested-by: Gluster Build System <jenkins.com> Reviewed-by: Bala FA <barumuga> Reviewed-by: Niels de Vos <ndevos>
REVIEW: http://review.gluster.org/5255 (rpm: move the mount/api xlator to the glusterfs-api sub-package) posted (#1) for review on master by Niels de Vos (ndevos)
COMMIT: http://review.gluster.org/5255 committed in master by Vijay Bellur (vbellur) ------ commit 8404ec28e4216de1783ea6fe19c79789378250a9 Author: Niels de Vos <ndevos> Date: Wed Jun 26 13:25:22 2013 +0200 rpm: move the mount/api xlator to the glusterfs-api sub-package The main glusterfs package included the xlator/api.so file which caused a dependency on the glusterfs-api package: # rpm -i glusterfs-3.4.0-0.6.beta3.el6.x86_64.rpm error: Failed dependencies: libgfapi.so.0()(64bit) is needed by glusterfs-3.4.0-0.6.beta3.el6.x86_64 Moving the mount/api xlator to the glusterfs-api package will prevent the automatic dependency generator to add the dependency to the main package. Change-Id: I4650c40cdfe610b9b69bab07d262093854aa6583 BUG: 950083 Reported-by: Vijay Bellur <vbellur> Signed-off-by: Niels de Vos <ndevos> Reviewed-on: http://review.gluster.org/5255 Reviewed-by: Kaleb KEITHLEY <kkeithle> Tested-by: Gluster Build System <jenkins.com> Reviewed-by: Vijay Bellur <vbellur>
REVIEW: http://review.gluster.org/5264 (build: sync glusterfs.spec.in with Fedora glusterfs.spec) posted (#1) for review on master by Kaleb KEITHLEY (kkeithle)
REVIEW: http://review.gluster.org/5264 (build: sync glusterfs.spec.in with Fedora glusterfs.spec) posted (#2) for review on master by Kaleb KEITHLEY (kkeithle)
REVIEW: http://review.gluster.org/5264 (build: sync glusterfs.spec.in with Fedora glusterfs.spec) posted (#3) for review on master by Kaleb KEITHLEY (kkeithle)
REVIEW: http://review.gluster.org/5264 (build: sync glusterfs.spec.in with Fedora glusterfs.spec) posted (#4) for review on master by Kaleb KEITHLEY (kkeithle)
COMMIT: http://review.gluster.org/5264 committed in master by Vijay Bellur (vbellur) ------ commit e216e2e6fcc537d7fdae4527043a2a71732c7d36 Author: Kaleb S. KEITHLEY <kkeithle> Date: Thu Jun 27 10:44:44 2013 -0400 build: sync glusterfs.spec.in with Fedora glusterfs.spec * fix the hardening fix for shlibs * use %{__sed} macro * better short ChangeLog * fix hard-coded path in extras/systemd/glusterd.service in, use @prefix@ Change-Id: I267244b68a97cbcd6f6ab62fc322c78db45023bb BUG: 950083 Signed-off-by: Kaleb S. KEITHLEY <kkeithle> Reviewed-on: http://review.gluster.org/5264 Tested-by: Gluster Build System <jenkins.com> Reviewed-by: Niels de Vos <ndevos>
REVIEW: http://review.gluster.org/5397 (build: Add '--without bd' to disable 'bd' xlator rpmbuild) posted (#1) for review on master by Harshavardhana (harsha)
COMMIT: http://review.gluster.org/5397 committed in master by Anand Avati (avati) ------ commit 115f6a679ba0117a5757fe69f8f326d633c38fbf Author: Harshavardhana <harsha> Date: Thu Jul 25 20:10:55 2013 -0700 build: Add '--without bd' to disable 'bd' xlator rpmbuild Change-Id: I9f1774788362d8250693002318b617cd16e1a668 BUG: 950083 Signed-off-by: Harshavardhana <harsha> Reviewed-on: http://review.gluster.org/5397 Reviewed-by: Kaleb KEITHLEY <kkeithle> Tested-by: Gluster Build System <jenkins.com> Reviewed-by: Bala FA <barumuga> Reviewed-by: Anand Avati <avati>
REVIEW: http://review.gluster.org/5455 (build: sync glusterfs.spec.in with Fedora glusterfs.spec) posted (#1) for review on master by Kaleb KEITHLEY (kkeithle)
REVIEW: http://review.gluster.org/5455 (build: sync glusterfs.spec.in with Fedora glusterfs.spec) posted (#2) for review on master by Kaleb KEITHLEY (kkeithle)
COMMIT: http://review.gluster.org/5455 committed in master by Anand Avati (avati) ------ commit a482e4220a6c9fe2909f9d5f1b484f68deecec64 Author: Kaleb S. KEITHLEY <kkeithle> Date: Tue Jul 30 14:00:46 2013 -0400 build: sync glusterfs.spec.in with Fedora glusterfs.spec (this is the master branch) * Sync with latest Fedora updates * add glusterfs-libs RPM for RHEL6.5 oVirt/qemu-kvm, see BZ 916645 BUG: 950083 Change-Id: If5816f9b6a9478f6663c1de4d14a9f8341da9e84 Signed-off-by: Kaleb S. KEITHLEY <kkeithle> Reviewed-on: http://review.gluster.org/5455 Reviewed-by: Vijay Bellur <vbellur> Tested-by: Gluster Build System <jenkins.com>
REVIEW: http://review.gluster.org/5522 (build: sync glusterfs.spec.in with Fedora glusterfs.spec) posted (#1) for review on master by Kaleb KEITHLEY (kkeithle)
COMMIT: http://review.gluster.org/5522 committed in master by Anand Avati (avati) ------ commit 5fb1714c64660c69e51301f61b63e63931f85227 Author: Kaleb S. KEITHLEY <kkeithle> Date: Wed Aug 7 09:11:48 2013 -0400 build: sync glusterfs.spec.in with Fedora glusterfs.spec (this is the master branch) * add necessary requires * add -cli subpackage * fix other minor differences with Fedora glusterfs.spec Change-Id: Ifd535463a68cfd0793691e37148f411b95b41867 BUG: 950083 Signed-off-by: Kaleb S. KEITHLEY <kkeithle> Reviewed-on: http://review.gluster.org/5522 Reviewed-by: Niels de Vos <ndevos> Tested-by: Gluster Build System <jenkins.com>
REVIEW: http://review.gluster.org/4797 (spec: add the alphatag global variable) posted (#3) for review on master by Anand Avati (avati)
REVIEW: http://review.gluster.org/6059 (build: sync glusterfs.spec.in with Fedora glusterfs.spec) posted (#1) for review on master by Kaleb KEITHLEY (kkeithle)
REVIEW: http://review.gluster.org/6059 (build: sync glusterfs.spec.in with Fedora glusterfs.spec) posted (#2) for review on master by Kaleb KEITHLEY (kkeithle)
COMMIT: http://review.gluster.org/6059 committed in master by Anand Avati (avati) ------ commit 6d28941b0b32ae0053604021925dfdc8d40a1047 Author: Kaleb S. KEITHLEY <kkeithle> Date: Wed Oct 9 08:29:18 2013 -0400 build: sync glusterfs.spec.in with Fedora glusterfs.spec (this is the master branch) sync with Fedora glusterfs.spec 3.4.1-2+ Change-Id: I8a303efb0ac8cd3e04531e2f02427e3590387493 BUG: 950083 Signed-off-by: Kaleb S. KEITHLEY <kkeithle> Reviewed-on: http://review.gluster.org/6059 Tested-by: Gluster Build System <jenkins.com> Reviewed-by: Anand Avati <avati>
REVIEW: http://review.gluster.org/6458 (build: FedoraSCM sources are not longer needed to build RPMs) posted (#1) for review on master by Kaleb KEITHLEY (kkeithle)
COMMIT: http://review.gluster.org/6458 committed in master by Anand Avati (avati) ------ commit f4488e34553ec0bf68c270034af179ab14fd2b58 Author: Kaleb S. KEITHLEY <kkeithle> Date: Fri Dec 6 14:33:51 2013 -0500 build: FedoraSCM sources are not longer needed to build RPMs Also some updates to .gitignore Change-Id: I576af453ca7d1ec1f3db21ee4d8386927988e7db BUG: 950083 Signed-off-by: Kaleb S. KEITHLEY <kkeithle> Reviewed-on: http://review.gluster.org/6458 Tested-by: Gluster Build System <jenkins.com> Reviewed-by: Anand Avati <avati>
REVIEW: http://review.gluster.org/6473 (build: Merge glusterfs.spec changes from Fedora) posted (#1) for review on master by Kaleb KEITHLEY (kkeithle)
REVIEW: http://review.gluster.org/6473 (build: Merge glusterfs.spec changes from Fedora) posted (#2) for review on master by Kaleb KEITHLEY (kkeithle)
REVIEW: http://review.gluster.org/6473 (build: Merge glusterfs.spec changes from Fedora) posted (#3) for review on master by Kaleb KEITHLEY (kkeithle)
REVIEW: http://review.gluster.org/6473 (build: Merge glusterfs.spec changes from Fedora) posted (#4) for review on master by Kaleb KEITHLEY (kkeithle)
COMMIT: http://review.gluster.org/6473 committed in master by Vijay Bellur (vbellur) ------ commit 51a614384e694f37d957a3aa3a562c34877e71d5 Author: Kaleb S. KEITHLEY <kkeithle> Date: Tue Dec 10 07:26:46 2013 -0500 build: Merge glusterfs.spec changes from Fedora sync with FedoraSCM glusterfs.spec N.B. the %doc hack for clear_xattrs.sh doesn't work in the CentOS 5 mock builds of the rpm.t regression test, thus I'm leaving that out for now Change-Id: I6fa85618c916a90fdbed5b231ea58bb51c9d2b70 BUG: 950083 Signed-off-by: Kaleb S. KEITHLEY <kkeithle> Reviewed-on: http://review.gluster.org/6473 Tested-by: Gluster Build System <jenkins.com> Reviewed-by: Niels de Vos <ndevos>
REVIEW: http://review.gluster.org/6642 (build: the main glusterfs package should not provide glusterfs-libs) posted (#1) for review on master by Niels de Vos (ndevos)
REVIEW: http://review.gluster.org/6643 (build: the main glusterfs package should not provide glusterfs-libs) posted (#1) for review on release-3.5 by Niels de Vos (ndevos)
REVIEW: http://review.gluster.org/6644 (build: the main glusterfs package should not provide glusterfs-libs) posted (#1) for review on release-3.4 by Niels de Vos (ndevos)
COMMIT: http://review.gluster.org/6642 committed in master by Vijay Bellur (vbellur) ------ commit 1e4f2d08f102e9fc1e27ffb5608d4b45c11e0b55 Author: Niels de Vos <ndevos> Date: Sat Jan 4 17:29:26 2014 +0100 build: the main glusterfs package should not provide glusterfs-libs Because of this incorrect provides, there is no requirement to update glusterfs-libs. Most users will get a newer glusterfs-libs when updating anyway, but users that manually select RPMs for updating my skip the package, which will break their system. Change-Id: I636dfac3f0a521924f1c2e82948bb513b0a5c9f9 BUG: 950083 Fedora-BUG: 1048489 Signed-off-by: Niels de Vos <ndevos> Reviewed-on: http://review.gluster.org/6642 Tested-by: Gluster Build System <jenkins.com> Reviewed-by: Kaleb KEITHLEY <kkeithle>
COMMIT: http://review.gluster.org/6643 committed in release-3.5 by Vijay Bellur (vbellur) ------ commit a99e4e4bf576e5120dca4f2a47fb1466a8005204 Author: Niels de Vos <ndevos> Date: Sat Jan 4 17:29:26 2014 +0100 build: the main glusterfs package should not provide glusterfs-libs Because of this incorrect provides, there is no requirement to update glusterfs-libs. Most users will get a newer glusterfs-libs when updating anyway, but users that manually select RPMs for updating my skip the package, which will break their system. Change-Id: If7d73236c21de07ff7fbe32e4ba2e84910ffb98d BUG: 950083 Fedora-BUG: 1048489 Signed-off-by: Niels de Vos <ndevos> Reviewed-on: http://review.gluster.org/6643 Tested-by: Gluster Build System <jenkins.com> Reviewed-by: Kaleb KEITHLEY <kkeithle>
COMMIT: http://review.gluster.org/6644 committed in release-3.4 by Vijay Bellur (vbellur) ------ commit 14f79a0b9e7a758b17e3c951bfa0150b3db0494a Author: Niels de Vos <ndevos> Date: Sat Jan 4 17:29:26 2014 +0100 build: the main glusterfs package should not provide glusterfs-libs Because of this incorrect provides, there is no requirement to update glusterfs-libs. Most users will get a newer glusterfs-libs when updating anyway, but users that manually select RPMs for updating my skip the package, which will break their system. Change-Id: I2458ff9c993dc069baf2de8d6e99aa2ede1d5969 BUG: 950083 Fedora-BUG: 1048489 Signed-off-by: Niels de Vos <ndevos> Reviewed-on: http://review.gluster.org/6644 Tested-by: Gluster Build System <jenkins.com> Reviewed-by: Kaleb KEITHLEY <kkeithle>