Merge branch 'SOFTWARE-5321.v3.2.0' into V3-branch

* SOFTWARE-5321.v3.2.0:
  Update spec file version and changelog (SOFTWARE-5321)
  Update version in Makefile (SOFTWARE-5321)

Makefile

@@ -1,12 +1,12 @@
-# Makefile for xcache-daemon
+# Makefile for xcache
 
 
 # ------------------------------------------------------------------------------
 # Release information: Update for each release
 # ------------------------------------------------------------------------------
 
 PACKAGE := xcache
-VERSION := 3.1.0
+VERSION := 3.2.0
 
 
 # ------------------------------------------------------------------------------

rpm/xcache.spec

@@ -1,6 +1,6 @@
 Name:      xcache
 Summary:   XCache scripts and configurations
-Version:   3.1.1
+Version:   3.2.0
 Release:   1%{?dist}
 License:   Apache 2.0
 Group:     Grid
@@ -279,9 +279,15 @@ mkdir -p %{buildroot}%{_sysconfdir}/grid-security/xrd
 %config %{_sysconfdir}/xrootd/config.d/03-redir-tuning.cfg
 
 %changelog
-* Fri Sep 02 2022 Carl Edquist <[email protected]> - 3.1.1-1
-- Generate authfile even if origin serves no public data (SOFTWARE-5028)
-- Refactor stash-authfile systemd files
+* Thu Sep 15 2022 Mátyás Selmeci <[email protected]> - 3.2.0-1
+- Allow specifying the xrootd instance (e.g. stash-cache, stash-origin-auth) to
+  authfile-update (SOFTWARE-5028)
+- Split stash-origin's "originexport" var into "PublicOriginExport" and
+  "AuthOriginExport" (SOFTWARE-5303)
+- Append contents of a "scitokens.conf.local" file to generated scitokens.conf (SOFTWARE-5315)
+- Includes Fri Sep 02 2022 Carl Edquist <[email protected]>:
+    - Generate authfile even if origin serves no public data (SOFTWARE-5028)
+    - Refactor stash-authfile systemd files
 
 * Fri May 13 2022 Carl Edquist <[email protected]> - 3.1.0-1
 - Drop GSI auth method (SOFTWARE-5121)