Merge remote-tracking branch 'origin' into kk-el5

glusterfs.spec

@@ -4,7 +4,7 @@
 %global _for_fedora_koji_builds 1
 
 # uncomment and add '%' to use the prereltag for pre-releases
-%global prereltag qa5
+# %%global prereltag qa5
 
 # if you wish to compile an rpm without rdma support, compile like this...
 # rpmbuild -ta @PACKAGE_NAME@-@PACKAGE_VERSION@.tar.gz --without rdma
@@ -56,7 +56,7 @@ Summary:          Cluster File System
 %if ( 0%{_for_fedora_koji_builds} )
 Name:             glusterfs
 Version:          3.4.2
-Release:          0.1%{?prereltag:.%{prereltag}}%{?dist}
+Release:          1%{?prereltag:.%{prereltag}}%{?dist}
 Vendor:           Fedora Project
 %else
 Name:             @PACKAGE_NAME@
@@ -772,6 +772,9 @@ if [ $1 -ge 1 ]; then
 fi
 
 %changelog
+* Fri Jan 3 2014 Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 3.5.0-1
+- GlusterFS 3.4.2 GA
+
 * Wed Dec 25 2013 Niels de Vos <ndevos@redhat.com> - 3.4.2-0.1qa5
 - GlusterFS 3.4.2 QA5, glusterfs-3.4.2-0.1qa5
 - Correct source URL to automatic release location

sources

@@ -1 +1 @@
-268bc2175216eee286a56030e9effba9  glusterfs-3.4.2qa5.tar.gz
+7c05304a9aca3c85ff27458461783623  glusterfs-3.4.2.tar.gz