summary refs log tree commit diff
diff options
context:
space:
mode:
authorDavid Robertson <davidr@element.io>2021-09-17 10:43:51 +0100
committerDavid Robertson <davidr@element.io>2021-09-17 10:43:51 +0100
commitdaac1e645cc64a588b63cffd6e0078a479b96a74 (patch)
tree43b0d1805df46d7c517b066c0a4109f3520af2ef
parentCleanup opentracing logging for syncs (#10828) (diff)
downloadsynapse-daac1e645cc64a588b63cffd6e0078a479b96a74.tar.xz
1.43.0rc2
-rw-r--r--CHANGES.md9
-rw-r--r--changelog.d/10828.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 4e9cefe69c..3b6e9a270e 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,3 +1,12 @@
+Synapse 1.43.0rc2 (2021-09-17)
+==============================
+
+Bugfixes
+--------
+
+- Added opentrace logging to help debug #9424. ([\#10828](https://github.com/matrix-org/synapse/issues/10828))
+
+
 Synapse 1.43.0rc1 (2021-09-14)
 ==============================
 
diff --git a/changelog.d/10828.bugfix b/changelog.d/10828.bugfix
deleted file mode 100644
index e00c10ec81..0000000000
--- a/changelog.d/10828.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Added opentrace logging to help debug #9424.
diff --git a/debian/changelog b/debian/changelog
index d3a6f6a4e6..7774cad55b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+matrix-synapse-py3 (1.43.0~rc2) stable; urgency=medium
+
+  * New synapse release 1.43.0~rc2.
+
+ -- Synapse Packaging team <packages@matrix.org>  Fri, 17 Sep 2021 10:43:21 +0100
+
 matrix-synapse-py3 (1.43.0~rc1) stable; urgency=medium
 
   * New synapse release 1.43.0~rc1.
diff --git a/synapse/__init__.py b/synapse/__init__.py
index d62ccd1dbc..c9ef90ccaa 100644
--- a/synapse/__init__.py
+++ b/synapse/__init__.py
@@ -47,7 +47,7 @@ try:
 except ImportError:
     pass
 
-__version__ = "1.43.0rc1"
+__version__ = "1.43.0rc2"
 
 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