From f261ad06b3eb39736a31d06fb2ecadb3378f5048 Mon Sep 17 00:00:00 2001
From: Russ Allbery <rra@lsst.org>
Date: Mon, 15 May 2023 17:12:00 -0700
Subject: [PATCH] Prepare the 9.2.1 release

---
 CHANGELOG.md                                | 12 ++++++++++++
 changelog.d/20230515_120829_rra_DM_39186.md |  4 ----
 changelog.d/20230515_152805_rra_DM_39186.md |  3 ---
 3 files changed, 12 insertions(+), 7 deletions(-)
 delete mode 100644 changelog.d/20230515_120829_rra_DM_39186.md
 delete mode 100644 changelog.d/20230515_152805_rra_DM_39186.md

diff --git a/CHANGELOG.md b/CHANGELOG.md
index eb4679d21..08a655374 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,18 @@ Dependencies are updated to the latest available version during each release. Th
 
 <!-- scriv-insert-here -->
 
+<a id='changelog-9.2.1'></a>
+## 9.2.1 (2023-05-15)
+
+### Bug fixes
+
+- TCP keepalive for Redis connections apparently caused problems with holding connections open that the Redis server wanted to close. The TCP keepalive setting has been removed, which appears to increase the stability of the Redis connections.
+- Connections to Redis are now retried longer (about eight seconds instead of three seconds) in the hope of surviving a Redis restart without failures.
+
+### Other changes
+
+- Gafaelfawr now uses the [Ruff](https://beta.ruff.rs/docs/) linter instead of flake8, isort, and pydocstyle.
+
 <a id='changelog-9.2.0'></a>
 ## 9.2.0 (2023-04-19)
 
diff --git a/changelog.d/20230515_120829_rra_DM_39186.md b/changelog.d/20230515_120829_rra_DM_39186.md
deleted file mode 100644
index 3f00f67e2..000000000
--- a/changelog.d/20230515_120829_rra_DM_39186.md
+++ /dev/null
@@ -1,4 +0,0 @@
-### Bug fixes
-
-- TCP keepalive for Redis connections apparently caused problems with holding connections open that the Redis server wanted to close. The TCP keepalive setting has been removed, which appears to increase the stability of the Redis connections.
-- Connections to Redis are now retried longer (about eight seconds instead of three seconds) in the hope of surviving a Redis restart without failures.
diff --git a/changelog.d/20230515_152805_rra_DM_39186.md b/changelog.d/20230515_152805_rra_DM_39186.md
deleted file mode 100644
index 0505f6dfd..000000000
--- a/changelog.d/20230515_152805_rra_DM_39186.md
+++ /dev/null
@@ -1,3 +0,0 @@
-### Other changes
-
-- Gafaelfawr now uses the [Ruff](https://beta.ruff.rs/docs/) linter instead of flake8, isort, and pydocstyle.