summary refs log tree commit diff
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2021-05-17 11:34:39 +0100
committerErik Johnston <erik@matrix.org>2021-05-17 11:34:39 +0100
commitafb6dcf806d5a290d8cbd2c911c6a712ae3cf391 (patch)
tree688913a237cc792d89b29dcacf3a1cd7fe87e2e7
parentIncorporate changes from review (diff)
downloadsynapse-afb6dcf806d5a290d8cbd2c911c6a712ae3cf391.tar.xz
1.34.0
-rw-r--r--CHANGES.md11
-rw-r--r--debian/changelog6
-rw-r--r--synapse/__init__.py2
3 files changed, 16 insertions, 3 deletions
diff --git a/CHANGES.md b/CHANGES.md
index 2ceae0ac8c..1e3fd130fd 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,10 +1,17 @@
-Synapse 1.34.0rc1 (2021-05-12)
-==============================
+Synapse 1.34.0 (2021-05-17)
+===========================
 
 This release deprecates the `room_invite_state_types` configuration setting. See the [upgrade notes](https://github.com/matrix-org/synapse/blob/release-v1.34.0/UPGRADE.rst#upgrading-to-v1340) for instructions on updating your configuration file to use the new `room_prejoin_state` setting.
 
 This release also deprecates the `POST /_synapse/admin/v1/rooms/<room_id>/delete` admin API route. Server administrators are encouraged to update their scripts to use the new `DELETE /_synapse/admin/v1/rooms/<room_id>` route instead.
 
+
+No significant changes.
+
+
+Synapse 1.34.0rc1 (2021-05-12)
+==============================
+
 Features
 --------
 
diff --git a/debian/changelog b/debian/changelog
index 76b82c172e..bf99ae772c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+matrix-synapse-py3 (1.34.0) stable; urgency=medium
+
+  * New synapse release 1.34.0.
+
+ -- Synapse Packaging team <packages@matrix.org>  Mon, 17 May 2021 11:34:18 +0100
+
 matrix-synapse-py3 (1.33.2) stable; urgency=medium
 
   * New synapse release 1.33.2.
diff --git a/synapse/__init__.py b/synapse/__init__.py
index 15d54a1ceb..7498a6016f 100644
--- a/synapse/__init__.py
+++ b/synapse/__init__.py
@@ -47,7 +47,7 @@ try:
 except ImportError:
     pass
 
-__version__ = "1.34.0rc1"
+__version__ = "1.34.0"
 
 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