Merge branch 'release-v1.37' into develop

2021-06-29 21:48:24 +01:00 · 2021-06-29 21:48:24 +01:00 · bc5589a1bb
parent 785bceef72 d561367c18
commit bc5589a1bb
4 changed files with 10 additions and 3 deletions
--- a/CHANGES.md
+++ b/CHANGES.md
@ -1,3 +1,12 @@
+Synapse 1.37.1rc1 (2021-06-29)
+==============================
+
+Features
+--------
+
+- Handle inbound events from federation asynchronously. ([\#10269](https://github.com/matrix-org/synapse/issues/10269), [\#10272](https://github.com/matrix-org/synapse/issues/10272))
+
+
 Synapse 1.37.0 (2021-06-29)
 ===========================

--- a/changelog.d/10269.bugfix
+++ b/changelog.d/10269.bugfix
@ -1 +0,0 @@
-Handle inbound events from federation asynchronously.
--- a/changelog.d/10272.bugfix
+++ b/changelog.d/10272.bugfix
@ -1 +0,0 @@
-Handle inbound events from federation asynchronously.
--- a/synapse/init.py
+++ b/synapse/init.py
@ -47,7 +47,7 @@ try:
 except ImportError:
    pass

-__version__ = "1.37.1a1"
+__version__ = "1.37.1rc1"

 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
				`@ -1 +0,0 @@`
				`Handle inbound events from federation asynchronously.`