From 36e053760932b1f0da4ea2f9584ec27faf406bb6 Mon Sep 17 00:00:00 2001
From: Stephen Mackenzie <maxnbk@users.noreply.github.com>
Date: Sun, 14 Apr 2024 15:15:49 -0400
Subject: [PATCH] Release 3.1.1 (#1719)

Signed-off-by: Stephen Mackenzie <maxnbk@users.noreply.github.com>
---
 .mailmap                  |  2 ++
 CHANGELOG.md              | 18 ++++++++++++++++++
 src/rez/utils/_version.py |  2 +-
 3 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/.mailmap b/.mailmap
index 84b550271..f41c44669 100644
--- a/.mailmap
+++ b/.mailmap
@@ -165,6 +165,8 @@ Morné Chamberlain <thefreeman.za@gmail.com> <morne@blackginger.tv>
 
 Paul Molodowitch <elrond79@gmail.com> <paulm@luma-pictures.com>
 
+Robert Minsk <robertminsk@yahoo.com> cfxegbert <robertminsk@yahoo.com>
+
 Sylvain Maziere <sylvain@predat.fr> predat <sylvain@predat.fr>
 Sylvain Maziere <sylvain@predat.fr> <sylvain.maziere@mikrosimage.com>
 
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 895889e4b..58bd4c4cc 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,24 @@
 
 <!-- start-here-sphinx-start-after -->
 
+## 3.1.1 (2024-04-14)
+[Source](https://github.com/AcademySoftwareFoundation/rez/tree/3.1.1) | [Diff](https://github.com/AcademySoftwareFoundation/rez/compare/3.1.0...3.1.1)
+
+### Fixes
+
+- Add symlink locking for filesystems that do not support hardlinks [\#1708](https://github.com/AcademySoftwareFoundation/rez/pull/1708) ([cfxegbert](https://github.com/cfxegbert))
+- Fix error caused by weakly referenced package not specifying version ▒ [\#1712](https://github.com/AcademySoftwareFoundation/rez/pull/1712) ([loonghao](https://github.com/loonghao))
+
+### Documentation
+
+- Add plugin documentation page [\#1703](https://github.com/AcademySoftwareFoundation/rez/pull/1703) ([BryceGattis](https://github.com/BryceGattis))
+- Make gh-rez external link dynamic [\#1707](https://github.com/AcademySoftwareFoundation/rez/pull/1707) ([BryceGattis](https://github.com/BryceGattis))
+
+### Miscellaneous
+
+- Convert all plugin rezconfig to rezconfig.py [\#1692](https://github.com/AcademySoftwareFoundation/rez/pull/1692) ([brycegbrazen](https://github.com/brycegbrazen))
+
+
 ## 3.1.0 (2024-03-30)
 [Source](https://github.com/AcademySoftwareFoundation/rez/tree/3.1.0) | [Diff](https://github.com/AcademySoftwareFoundation/rez/compare/3.3.0...3.1.0)
 
diff --git a/src/rez/utils/_version.py b/src/rez/utils/_version.py
index ceda9738d..f4fd4ec01 100644
--- a/src/rez/utils/_version.py
+++ b/src/rez/utils/_version.py
@@ -4,4 +4,4 @@
 
 # Update this value to version up Rez. Do not place anything else in this file.
 # Using .devN allows us to run becnmarks and create proper benchmark reports on PRs.
-_rez_version = "3.1.0"
+_rez_version = "3.1.1"