Merge pull request #191 from brianhlin/master

Bump version to 3.1.1

Author: brianhlin

config/01-common-collector-defaults.conf

@@ -5,11 +5,6 @@
 #
 ###############################################################################
 
-# This sets the default port to 9619 on newer versions of HTCondor (8.3.x)
-# This allows users to no longer have to explicitly set the port in the
-# command line.
-COLLECTOR_PORT=9619
-
 STATUS_DEFAULT_SCHEDD_PRINT_FORMAT_FILE=/usr/share/condor-ce/ce-status.cpf
 STATUS_DEFAULT_STARTD_PRINT_FORMAT_FILE=/usr/share/condor-ce/pilot-status.cpf
 

config/condor_mapfile

@@ -18,9 +18,9 @@
 #
 # GSI "^<DISTINGUISHED NAME>$" <USERNAME>@users.htcondor.org
 
-# The first VOMS attribute can also be used for mapping:
+# VOMS attributes can also be used for mapping:
 #
-# GSI "<DISTINGUISHED NAME>,<FIRST VOMS FQAN>" <USERNAME>@users.htcondor.org
+# GSI "<DISTINGUISHED NAME>,<VOMS FQAN 1>,<VOMS FQAN 2>,...,<VOMSFQAN N>" <USERNAME>@users.htcondor.org
 
 # You can use regular expressions for mapping certificate and VOMS attribute
 # credentials.  For example, to map any GLOW certificate with the 'htpc' role to

rpm/htcondor-ce.spec

@@ -2,7 +2,7 @@
 #define gitrev osg
 
 Name: htcondor-ce
-Version: 3.1.0
+Version: 3.1.1
 Release: 1%{?gitrev:.%{gitrev}git}%{?dist}
 Summary: A framework to run HTCondor as a CE
 BuildArch: noarch
@@ -491,7 +491,12 @@ fi
 %attr(1777,root,root) %dir %{_localstatedir}/lib/gratia/condorce_data
 
 %changelog
-* Thu Mar 15 2018 Brian Lin <blin@cs.wisc.edu> - 3.0.4-1
+* Fri Apr 06 2018 Brian Lin <blin@cs.wisc.edu> - 3.1.1-1
+- Allow InCommon host certs
+- Drop vestigal HTCondor-related configuration
+- Add documentation for mapping multiple VOMS attributes
+
+* Thu Mar 15 2018 Brian Lin <blin@cs.wisc.edu> - 3.1.0-1
 - Removed OSG-specific code and configuration from builds intended for the
   HTCondor repo
 - Updated the CERN BDII provider