diff options
author | David Robertson <davidr@element.io> | 2021-11-23 10:09:27 +0000 |
---|---|---|
committer | David Robertson <davidr@element.io> | 2021-11-23 10:09:27 +0000 |
commit | e147f067c5cf72d6ec319b2df45b4a243bcfad5d (patch) | |
tree | 4edeacb236720198e4d8b2e44767242213f322c8 | |
parent | Merge branch 'release-v1.47' of github.com:matrix-org/synapse into matrix-org... (diff) | |
parent | 1.47.0 (diff) | |
download | synapse-e147f067c5cf72d6ec319b2df45b4a243bcfad5d.tar.xz |
Merge branch 'release-v1.47' into matrix-org-hotfixes
-rw-r--r-- | CHANGES.md | 16 | ||||
-rw-r--r-- | changelog.d/11303.misc | 1 | ||||
-rw-r--r-- | changelog.d/11346.bugfix | 1 | ||||
-rw-r--r-- | changelog.d/11353.misc | 1 | ||||
-rw-r--r-- | debian/changelog | 12 | ||||
-rw-r--r-- | synapse/__init__.py | 2 |
6 files changed, 29 insertions, 4 deletions
diff --git a/CHANGES.md b/CHANGES.md index a188bd3f4d..a435d9c592 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -1,3 +1,19 @@ +Synapse 1.47.0 (2021-11-17) +=========================== + +No significant changes since 1.47.0rc3. + + +Synapse 1.47.0rc3 (2021-11-16) +============================== + +Bugfixes +-------- + +- Fix a bug introduced in 1.47.0rc1 which caused worker processes to not halt startup in the presence of outstanding database migrations. ([\#11346](https://github.com/matrix-org/synapse/issues/11346)) +- Fix a bug introduced in 1.47.0rc1 which prevented the 'remove deleted devices from `device_inbox` column' background process from running when updating from a recent Synapse version. ([\#11303](https://github.com/matrix-org/synapse/issues/11303), [\#11353](https://github.com/matrix-org/synapse/issues/11353)) + + Synapse 1.47.0rc2 (2021-11-10) ============================== diff --git a/changelog.d/11303.misc b/changelog.d/11303.misc deleted file mode 100644 index 50af92bfa5..0000000000 --- a/changelog.d/11303.misc +++ /dev/null @@ -1 +0,0 @@ -Fix an issue which prevented the 'remove deleted devices from device_inbox column' background process from running when updating from a recent Synapse version. diff --git a/changelog.d/11346.bugfix b/changelog.d/11346.bugfix deleted file mode 100644 index 1fe8020eab..0000000000 --- a/changelog.d/11346.bugfix +++ /dev/null @@ -1 +0,0 @@ -Fix a bug introduced in v1.47.0rc1 which caused worker processes to not halt startup in the presence of outstanding database migrations. \ No newline at end of file diff --git a/changelog.d/11353.misc b/changelog.d/11353.misc deleted file mode 100644 index fa96dae919..0000000000 --- a/changelog.d/11353.misc +++ /dev/null @@ -1 +0,0 @@ -Fix an issue which prevented the 'remove deleted devices from `device_inbox` column' background process from running when updating from a recent Synapse version. \ No newline at end of file diff --git a/debian/changelog b/debian/changelog index b3ebfb84c7..ba75d0b251 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,15 @@ +matrix-synapse-py3 (1.47.0) stable; urgency=medium + + * New synapse release 1.47.0. + + -- Synapse Packaging team <packages@matrix.org> Wed, 17 Nov 2021 13:09:43 +0000 + +matrix-synapse-py3 (1.47.0~rc3) stable; urgency=medium + + * New synapse release 1.47.0~rc3. + + -- Synapse Packaging team <packages@matrix.org> Tue, 16 Nov 2021 14:32:47 +0000 + matrix-synapse-py3 (1.47.0~rc2) stable; urgency=medium [ Dan Callahan ] diff --git a/synapse/__init__.py b/synapse/__init__.py index 06b179a7e8..aa964afb5e 100644 --- a/synapse/__init__.py +++ b/synapse/__init__.py @@ -47,7 +47,7 @@ try: except ImportError: pass -__version__ = "1.47.0rc2" +__version__ = "1.47.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 |