summary refs log tree commit diff
diff options
context:
space:
mode:
authorAndrew Morgan <andrew@amorgan.xyz>2021-04-21 18:45:39 +0100
committerAndrew Morgan <andrew@amorgan.xyz>2021-04-21 18:45:39 +0100
commit55159c48e31129c87b55d15d203df946ca33f884 (patch)
tree5abb1d0ef05839a856e4345ecd7bf2a8bb302b2e
parentMerge branch 'release-v1.32.1' of github.com:matrix-org/synapse into release-... (diff)
downloadsynapse-55159c48e31129c87b55d15d203df946ca33f884.tar.xz
1.32.2
-rw-r--r--CHANGES.md11
-rw-r--r--changelog.d/9857.bugfix1
-rw-r--r--debian/changelog6
-rw-r--r--synapse/__init__.py2
4 files changed, 18 insertions, 2 deletions
diff --git a/CHANGES.md b/CHANGES.md
index a1349252cb..f194f4db30 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,3 +1,14 @@
+Synapse 1.32.2 (2021-04-21)
+===========================
+
+This release includes fixes for the two regressions introduced in 1.32.0.
+
+Bugfixes
+--------
+
+- Fix a regression in Synapse v1.32.1 which caused `LoggingContext` errors in plugins. ([\#9857](https://github.com/matrix-org/synapse/issues/9857))
+
+
 Synapse 1.32.1 (2021-04-21)
 ===========================
 
diff --git a/changelog.d/9857.bugfix b/changelog.d/9857.bugfix
deleted file mode 100644
index 7eed41594d..0000000000
--- a/changelog.d/9857.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fix a regression in Synapse v1.32.1 which caused `LoggingContext` errors in plugins.
diff --git a/debian/changelog b/debian/changelog
index b8cf2cac58..9ebfc3c3f1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+matrix-synapse-py3 (1.32.2) stable; urgency=medium
+
+  * New synapse release 1.32.2.
+
+ -- Synapse Packaging team <packages@matrix.org>  Wed, 21 Apr 2021 18:43:52 +0100
+
 matrix-synapse-py3 (1.32.1) stable; urgency=medium
 
   * New synapse release 1.32.1.
diff --git a/synapse/__init__.py b/synapse/__init__.py
index a0332d602d..781f5ac3a2 100644
--- a/synapse/__init__.py
+++ b/synapse/__init__.py
@@ -48,7 +48,7 @@ try:
 except ImportError:
     pass
 
-__version__ = "1.32.1"
+__version__ = "1.32.2"
 
 if bool(os.environ.get("SYNAPSE_TEST_PATCH_LOG_CONTEXTS", False)):
     # We import here so that we don't have to install a bunch of deps when