summary refs log tree commit diff
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2020-11-18 11:41:41 +0000
committerErik Johnston <erik@matrix.org>2020-11-18 11:41:41 +0000
commitef366720d5745dac48a87802a40d5cb359b92e4b (patch)
tree8a5859e9fb83e925b8fccb451be5c769b148a642
parentCap the version of prometheus_client to <v0.9.0 in the dockerfile (#8767) (diff)
downloadsynapse-ef366720d5745dac48a87802a40d5cb359b92e4b.tar.xz
1.23.0
-rw-r--r--CHANGES.md9
-rw-r--r--changelog.d/8767.bugfix1
-rw-r--r--debian/changelog6
-rw-r--r--synapse/__init__.py2
4 files changed, 16 insertions, 2 deletions
diff --git a/CHANGES.md b/CHANGES.md

index 75871979c2..15d7d0aeea 100644 --- a/CHANGES.md +++ b/CHANGES.md
@@ -1,3 +1,12 @@ +Synapse 1.23.0 (2020-11-18) +=========================== + +Bugfixes +-------- + +- Fix a dependency versioning bug in the Dockerfile that prevented Synapse from starting. ([\#8767](https://github.com/matrix-org/synapse/issues/8767)) + + Synapse 1.23.0rc1 (2020-11-13) ============================== diff --git a/changelog.d/8767.bugfix b/changelog.d/8767.bugfix deleted file mode 100644
index 9fe5107a5e..0000000000 --- a/changelog.d/8767.bugfix +++ /dev/null
@@ -1 +0,0 @@ -Fix a dependency versioning bug in the Dockerfile that prevented Synapse from starting. diff --git a/debian/changelog b/debian/changelog
index ae8948650f..4ea4feddd5 100644 --- a/debian/changelog +++ b/debian/changelog
@@ -1,3 +1,9 @@ +matrix-synapse-py3 (1.23.0) stable; urgency=medium + + * New synapse release 1.23.0. + + -- Synapse Packaging team <packages@matrix.org> Wed, 18 Nov 2020 11:41:28 +0000 + matrix-synapse-py3 (1.22.1) stable; urgency=medium * New synapse release 1.22.1. diff --git a/synapse/__init__.py b/synapse/__init__.py
index 537f2239e5..65c1f5aa3f 100644 --- a/synapse/__init__.py +++ b/synapse/__init__.py
@@ -48,7 +48,7 @@ try: except ImportError: pass -__version__ = "1.23.0rc1" +__version__ = "1.23.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