summary refs log tree commit diff
diff options
context:
space:
mode:
authorDavid Robertson <davidr@element.io>2022-01-25 12:52:27 +0000
committerDavid Robertson <davidr@element.io>2022-01-25 12:52:27 +0000
commit6911604a0fb7ffc150cee51e9d15b45ffc4c6741 (patch)
treea966e76e07aa897b63171a1010271aa6f9132aa4
parentAdd admin API to reset connection timeouts for remote server (#11639) (diff)
parentMerge branch 'release-v1.51' (diff)
downloadsynapse-6911604a0fb7ffc150cee51e9d15b45ffc4c6741.tar.xz
Merge branch 'master' into develop
-rw-r--r--CHANGES.md9
-rw-r--r--debian/changelog12
-rw-r--r--synapse/__init__.py2
3 files changed, 21 insertions, 2 deletions
diff --git a/CHANGES.md b/CHANGES.md
index c4bdaf25bc..37b9e6bb96 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,3 +1,10 @@
+Synapse 1.51.0 (2022-01-25)
+===========================
+
+No significant changes since 1.51.0rc2.
+
+Synapse 1.51.0 deprecates `webclient` listeners and non-HTTP(S) `web_client_location`s. Support for these will be removed in Synapse 1.53.0, at which point Synapse will not be capable of directly serving a web client for Matrix. See the [upgrade notes](https://matrix-org.github.io/synapse/develop/upgrade#upgrading-to-v1510).
+
 Synapse 1.51.0rc2 (2022-01-24)
 ==============================
 
@@ -66,7 +73,7 @@ Deprecations and Removals
 - Remove the unstable `/send_relation` endpoint. ([\#11682](https://github.com/matrix-org/synapse/issues/11682))
 - Remove `python_twisted_reactor_pending_calls` Prometheus metric. ([\#11724](https://github.com/matrix-org/synapse/issues/11724))
 - Remove the `password_hash` field from the response dictionaries of the [Users Admin API](https://matrix-org.github.io/synapse/latest/admin_api/user_admin_api.html). ([\#11576](https://github.com/matrix-org/synapse/issues/11576))
-- Deprecate support for `webclient` listeners and non-HTTP(S) `web_client_location` configuration. ([\#11774](https://github.com/matrix-org/synapse/issues/11774), [\#11783](https://github.com/matrix-org/synapse/issues/11783))
+- **Deprecate support for `webclient` listeners and non-HTTP(S) `web_client_location` configuration. ([\#11774](https://github.com/matrix-org/synapse/issues/11774), [\#11783](https://github.com/matrix-org/synapse/issues/11783))**
 
 
 Internal Changes
diff --git a/debian/changelog b/debian/changelog
index 41053e875a..3a598c4148 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,21 @@
+matrix-synapse-py3 (1.51.0) stable; urgency=medium
+
+  * New synapse release 1.51.0.
+
+ -- Synapse Packaging team <packages@matrix.org>  Tue, 25 Jan 2022 11:28:51 +0000
+
 matrix-synapse-py3 (1.51.0~rc2) stable; urgency=medium
 
   * New synapse release 1.51.0~rc2.
 
  -- Synapse Packaging team <packages@matrix.org>  Mon, 24 Jan 2022 12:25:00 +0000
 
+matrix-synapse-py3 (1.51.0~rc1) stable; urgency=medium
+
+  * New synapse release 1.51.0~rc1.
+
+ -- Synapse Packaging team <packages@matrix.org>  Fri, 21 Jan 2022 10:46:02 +0000
+
 matrix-synapse-py3 (1.50.2) stable; urgency=medium
 
   * New synapse release 1.50.2.
diff --git a/synapse/__init__.py b/synapse/__init__.py
index f2fd3b907f..603dbb27e1 100644
--- a/synapse/__init__.py
+++ b/synapse/__init__.py
@@ -47,7 +47,7 @@ try:
 except ImportError:
     pass
 
-__version__ = "1.51.0rc2"
+__version__ = "1.51.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