[gfal2/f20: 2/2] Merge branch 'master' into f20

[Alejandro Alvarez]

commit 0b3e389f1ce6ca8e94706e0b4337a4b390a194b4
Merge: 78bcbff a166571
Author: Alejandro Alvarez Ayllon <aalvarez at cern.ch>
Date:   Mon Aug 11 15:14:22 2014 +0200

    Merge branch 'master' into f20
    
    Conflicts:
    	gfal2.spec

 gfal2-gsiftp-session-reuse.patch |   14 ++++++++++++++
 gfal2.spec                       |    9 ++++++++-
 2 files changed, 22 insertions(+), 1 deletions(-)
---
diff --cc gfal2.spec
index 589d7d6,2958b74..5390b98
--- a/gfal2.spec
+++ b/gfal2.spec
@@@ -4,7 -4,7 +4,7 @@@
  Name:		gfal2
  Version:	2.6.8
  # https://fedoraproject.org/wiki/Packaging:NamingGuidelines#Release_Tag
--Release:	3%{?dist}
++Release:	4%{?dist}
  Summary:	Grid file access library 2.0
  Group:		Applications/Internet
  License:	ASL 2.0
@@@ -285,12 -289,12 +289,15 @@@ make DESTDIR=%{buildroot} instal
  
  
  %changelog
 -* Mon Aug 11 2014 Alejandro Alvarez Ayllon <aalvarez at cern.ch> - 2.6.8-3
++* Mon Aug 11 2014 Alejandro Alvarez Ayllon <aalvarez at cern.ch> - 2.6.8-4
+ - Disable GridFTP session reuse by default (see LCGUTIL-448)
+ 
 -* Fri Aug 08 2014 Alejandro Alvarez Ayllon <aalvarez at cern.ch> - 2.6.8-2
 +* Fri Aug 08 2014 Alejandro Alvarez Ayllon <aalvarez at cern.ch> - 2.6.8-3
  - Patch for symbol that dissapeared in Davix
  
 +* Tue Jul 29 2014 Alejandro Alvarez Ayllon <aalvarez at cern.ch> - 2.6.8-2
 +- Rebuilt for davix 0.3.4
 +
  * Mon Jul 28 2014 Alejandro Alvarez Ayllon <aalvarez at cern.ch> - 2.6.8-1
  - Release 2.6.8 of GFAL2