summary refs log tree commit diff
diff options
context:
space:
mode:
authorBrendan Abolivier <babolivier@matrix.org>2021-06-29 10:20:38 +0100
committerBrendan Abolivier <babolivier@matrix.org>2021-06-29 10:20:38 +0100
commit3d370efc6d79327079138808ef5ecb8cf9f24d9f (patch)
tree77361174d9f9a358b015fffaa5a963116615884c
parentAdd additional types to the federation transport server. (#10213) (diff)
parentMove deprecation notices to the top of the changelog (diff)
downloadsynapse-3d370efc6d79327079138808ef5ecb8cf9f24d9f.tar.xz
Merge branch 'master' into develop
-rw-r--r--CHANGES.md6
-rw-r--r--debian/changelog6
-rw-r--r--synapse/__init__.py2
3 files changed, 11 insertions, 3 deletions
diff --git a/CHANGES.md b/CHANGES.md
index e1cfa7aeba..0944371fec 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,10 +1,12 @@
-Synapse 1.37.0rc1 (2021-06-24)
-==============================
+Synapse 1.37.0 (2021-06-29)
+===========================
 
 This release deprecates the current spam checker interface. See the [upgrade notes](https://matrix-org.github.io/synapse/develop/upgrade#deprecation-of-the-current-spam-checker-interface) for more information on how to update to the new generic module interface.
 
 This release also removes support for fetching and renewing TLS certificates using the ACME v1 protocol, which has been fully decommissioned by Let's Encrypt on June 1st 2021. Admins previously using this feature should use a [reverse proxy](https://matrix-org.github.io/synapse/develop/reverse_proxy.html) to handle TLS termination, or use an external ACME client (such as [certbot](https://certbot.eff.org/)) to retrieve a certificate and key and provide them to Synapse using the `tls_certificate_path` and `tls_private_key_path` configuration settings.
 
+Synapse 1.37.0rc1 (2021-06-24)
+==============================
 
 Features
 --------
diff --git a/debian/changelog b/debian/changelog
index e640dadde9..cf190b7dba 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+matrix-synapse-py3 (1.37.0) stable; urgency=medium
+
+  * New synapse release 1.37.0.
+
+ -- Synapse Packaging team <packages@matrix.org>  Tue, 29 Jun 2021 10:15:25 +0100
+
 matrix-synapse-py3 (1.36.0) stable; urgency=medium
 
   * New synapse release 1.36.0.
diff --git a/synapse/__init__.py b/synapse/__init__.py
index 6d1c6d6f72..c865d2e100 100644
--- a/synapse/__init__.py
+++ b/synapse/__init__.py
@@ -47,7 +47,7 @@ try:
 except ImportError:
     pass
 
-__version__ = "1.37.0rc1"
+__version__ = "1.37.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