Merge OSG spec changes.

Author: bbockelm

conf/gridftp-hdfs.spec

@@ -1,8 +1,8 @@
 # Have gitrev be the short hash or branch name if doing a prerelease build
-# %define gitrev
+#define gitrev
 
 Name:           gridftp-hdfs
-Version:        1.1
+Version:        1.1.1
 Release:        1%{?gitrev:.%{gitrev}git}%{?dist}
 Summary:        HDFS DSI plugin for GridFTP
 Group:          System Environment/Daemons
@@ -101,10 +101,19 @@ fi
 %{_datarootdir}/osg/sysconfig/globus-gridftp-server-plugin
 
 %changelog
+* Tue Nov 07 2017 Brian Bockelman <bbockelm@cse.unl.edu> - 1.1.1-1
+- Fix potential crash when requesting new checksum types.
+
+* Thu Oct 26 2017 Mátyás Selmeci <matyas@cs.wisc.edu> - 1.1-1.1
+- Merge OSG changes (osg-sysconfig.patch)
+
 * Thu Oct 26 2017 Brian Bockelman <bbockelm@cse.unl.edu> - 1.1-1
 - Add support for CVMFS-style block checksums.
 - Minor deadlock fixes contributed by JasonAlt.
 
+* Tue Sep 05 2017 Mátyás Selmeci <matyas@cs.wisc.edu> - 1.0-1.1
+- Add osg-sysconfig.patch
+
 * Thu Aug 24 2017 Mátyás Selmeci <matyas@cs.wisc.edu> - 1.0-1
 - Update to latest version from github (SOFTWARE-2856)
 - Remove upstreamed patches