From bdb4c20dc1ed4b5c88ac2889d1a02a32a9dd8a1f Mon Sep 17 00:00:00 2001
From: Andrew Morgan <andrew@amorgan.xyz>
Date: Wed, 21 Apr 2021 14:44:04 +0100
Subject: [PATCH] Clarify 1.32.0/1 changelog and upgrade notes

---
 CHANGES.md  |  4 +---
 UPGRADE.rst | 11 ++++++-----
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index cc66f2f01d..7188f94445 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -18,9 +18,7 @@ Synapse 1.32.0 (2021-04-20)
 
 **Note:** This release introduces [a regression](https://github.com/matrix-org/synapse/issues/9853)
 that can overwhelm connected Prometheus instances. This issue was not present in
-Synapse v1.32.0rc1. It is recommended not to update to this release. If you have
-upgraded to v1.32.0 already, please downgrade to v1.31.0. This issue will be
-resolved in a subsequent release version shortly.
+1.32.0rc1, and is fixed in 1.32.1. See the changelog for 1.32.1 above for more information.
 
 **Note:** This release requires Python 3.6+ and Postgres 9.6+ or SQLite 3.22+.
 
diff --git a/UPGRADE.rst b/UPGRADE.rst
index d4651ec2d3..76d2ee394f 100644
--- a/UPGRADE.rst
+++ b/UPGRADE.rst
@@ -92,11 +92,12 @@ Regression causing connected Prometheus instances to become overwhelmed
 -----------------------------------------------------------------------
 
 This release introduces `a regression <https://github.com/matrix-org/synapse/issues/9853>`_
-that can overwhelm connected Prometheus instances. This issue was not present in
-Synapse v1.32.0rc1. It is recommended not to update to this release. If you have
-upgraded to v1.32.0 already, please upgrade to v1.31.1 which contains a fix.
-If you started Synapse on v1.32.0, you may need to remove excess writeahead logs
-in order for Prometheus to recover; instructions for doing so are
+that can overwhelm connected Prometheus instances. This issue is not present in
+Synapse v1.32.0rc1, and is fixed in Synapse v1.32.1.
+
+If you have been affected, please first upgrade to a more recent Synapse version.
+You then may need to remove excess writeahead logs in order for Prometheus to recover.
+Instructions for doing so are provided
 `here <https://github.com/matrix-org/synapse/pull/9854#issuecomment-823472183>`_.
 
 Dropping support for old Python, Postgres and SQLite versions
-- 
GitLab