From 15c788e22d87de8f9780d2c8a7304fc0e7d506ab Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Mon, 8 Mar 2021 13:52:13 +0000 Subject: [PATCH 1/2] 1.29.0 --- CHANGES.md | 7 +++++-- debian/changelog | 7 +++++-- synapse/__init__.py | 2 +- 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index 15d2894bc6..a30afe6572 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -1,9 +1,12 @@ -Synapse 1.29.0rc1 (2021-03-04) -============================== +Synapse 1.29.0 (2021-03-08) +=========================== Note that synapse now expects an `X-Forwarded-Proto` header when used with a reverse proxy. Please see [UPGRADE.rst](UPGRADE.rst#upgrading-to-v1290) for more details on this change. +Synapse 1.29.0rc1 (2021-03-04) +============================== + Features -------- diff --git a/debian/changelog b/debian/changelog index 04cd0d0d68..3feefd8a1c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,12 @@ -matrix-synapse-py3 (1.29.0) UNRELEASED; urgency=medium +matrix-synapse-py3 (1.29.0) stable; urgency=medium [ Jonathan de Jong ] * Remove the python -B flag (don't generate bytecode) in scripts and documentation. - -- Synapse Packaging team Fri, 26 Feb 2021 14:41:31 +0100 + [ Synapse Packaging team ] + * New synapse release 1.29.0. + + -- Synapse Packaging team Mon, 08 Mar 2021 13:51:50 +0000 matrix-synapse-py3 (1.28.0) stable; urgency=medium diff --git a/synapse/__init__.py b/synapse/__init__.py index 2c24d4ae03..56ca888862 100644 --- a/synapse/__init__.py +++ b/synapse/__init__.py @@ -48,7 +48,7 @@ try: except ImportError: pass -__version__ = "1.29.0rc1" +__version__ = "1.29.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 From 4de1c3572818a68ded9e7054ca23dbfb531a6283 Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Mon, 8 Mar 2021 13:59:17 +0000 Subject: [PATCH 2/2] Fixup changelog --- CHANGES.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGES.md b/CHANGES.md index a30afe6572..99e314c68d 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -4,6 +4,9 @@ Synapse 1.29.0 (2021-03-08) Note that synapse now expects an `X-Forwarded-Proto` header when used with a reverse proxy. Please see [UPGRADE.rst](UPGRADE.rst#upgrading-to-v1290) for more details on this change. +No significant changes. + + Synapse 1.29.0rc1 (2021-03-04) ==============================