summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--CHANGES.md15
-rw-r--r--changelog.d/11303.misc1
-rw-r--r--changelog.d/11346.bugfix1
-rw-r--r--changelog.d/11353.misc1
-rw-r--r--debian/changelog6
-rw-r--r--synapse/__init__.py2
6 files changed, 22 insertions, 4 deletions
diff --git a/CHANGES.md b/CHANGES.md
index a188bd3f4d..8b11cccc1a 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,3 +1,18 @@
+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))
+
+
+Internal Changes
+----------------
+
+- Fix an issue 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..2acd0de3f5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+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..3b5878b912 100644
--- a/synapse/__init__.py
+++ b/synapse/__init__.py
@@ -47,7 +47,7 @@ try:
 except ImportError:
     pass
 
-__version__ = "1.47.0rc2"
+__version__ = "1.47.0rc3"
 
 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