[glusterfs/kk-el6: 1/2] Merge branch 'master' of ssh://pkgs.fedoraproject.org/glusterfs into kk-el6

[Kaleb S. KEITHLEY]

commit 14e450c0b87e755ec4f819414730dc961edf8848
Merge: 964843a a9739ec
Author: Kaleb S. KEITHLEY <kkeithle at redhat.com>
Date:   Mon Oct 28 06:53:22 2013 -0400

    Merge branch 'master' of ssh://pkgs.fedoraproject.org/glusterfs into kk-el6
    
    Conflicts:
    	glusterfs.spec

 glusterfs-3.4.1.add.base-port.config.option.patch |  156 +++++++++++++++++++++
 glusterfs.spec                                    |   19 +++-
 glusterfsd.service                                |   14 ++-
 3 files changed, 182 insertions(+), 7 deletions(-)
---
diff --cc glusterfs.spec
index 3fa0f54,e50aeb0..3536183
--- a/glusterfs.spec
+++ b/glusterfs.spec
@@@ -761,8 -763,20 +763,21 @@@ if [ $1 -ge 1 ]; the
      %_init_restart glusterd
  fi
  
+ %changelog
+ * Sun Oct 27 2013 Niels de Vos <ndevos at redhat.com> - 3.4.1-3
+ - Correctly start+stop glusterfsd.service (#1022542)
+ - fix "warning: File listed twice: .../glusterd.info" while building
  
 +%changelog
+ * Sat Oct 26 2013 Niels de Vos <ndevos at redhat.com>
+ - add base-port config option to /etc/glusterd/glusterd.vol (#1023653)
+ 
+ * Wed Oct 9 2013 Kaleb S. KEITHLEY <kkeithle[at]redhat.com>
+ - nit, sync with upstream spec
+ 
+ * Wed Oct 9 2013 Niels de Vos <ndevos at redhat.com>
+ - glusterfs-api-devel requires glusterfs-devel (#1016938, #1017094)
+ 
  * Tue Oct 1 2013 Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 3.4.1-2
  - resurrect /etc/init.d/glusterfsd, BUG 1014242