From 58e583eac1204e6eee6ee924a798180542f1e2c0 Mon Sep 17 00:00:00 2001 From: Andrew Morgan Date: Tue, 13 Oct 2020 10:27:16 +0100 Subject: [PATCH] 1.21.1 --- CHANGES.md | 6 ++++++ debian/changelog | 8 ++++++-- synapse/__init__.py | 2 +- 3 files changed, 13 insertions(+), 3 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index dec263013..75dc5fa89 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -1,3 +1,9 @@ +Synapse 1.21.1 (2020-10-13) +=========================== + +This release fixes a regression in v1.21.0 that prevented debian packages from being built. +It is otherwise identical to v1.21.0. + Synapse 1.21.0 (2020-10-12) =========================== diff --git a/debian/changelog b/debian/changelog index 27b670811..eeafd4f50 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,12 @@ -matrix-synapse-py3 (1.21.0+nmu1) UNRELEASED; urgency=medium +matrix-synapse-py3 (1.21.1) stable; urgency=medium + [ Synapse Packaging team ] + * New synapse release 1.21.1. + + [ Andrew Morgan ] * Explicitly install "test" python dependencies. - -- Andrew Morgan Mon, 12 Oct 2020 17:30:30 +0100 + -- Synapse Packaging team Tue, 13 Oct 2020 10:24:13 +0100 matrix-synapse-py3 (1.21.0) stable; urgency=medium diff --git a/synapse/__init__.py b/synapse/__init__.py index 57f818125..722b53a67 100644 --- a/synapse/__init__.py +++ b/synapse/__init__.py @@ -48,7 +48,7 @@ try: except ImportError: pass -__version__ = "1.21.0" +__version__ = "1.21.1" 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