summary refs log tree commit diff
path: root/changelog.d
diff options
context:
space:
mode:
authorRichard van der Hoff <richard@matrix.org>2021-06-29 19:55:55 +0100
committerRichard van der Hoff <richard@matrix.org>2021-06-29 19:55:55 +0100
commitc0bebd00ef81bff6c0ceeb6ad610146e1a271305 (patch)
treecee2c96567832143dd590635fd39b915e924352e /changelog.d
parentMove deprecation notices to the top of the changelog (diff)
parentHandle inbound events from federation asynchronously (#10272) (diff)
downloadsynapse-c0bebd00ef81bff6c0ceeb6ad610146e1a271305.tar.xz
Merge remote-tracking branch 'origin/erikj/async_federation_base_branch' into release-v1.37
Diffstat (limited to 'changelog.d')
-rw-r--r--changelog.d/10269.misc1
-rw-r--r--changelog.d/10272.bugfix1
2 files changed, 2 insertions, 0 deletions
diff --git a/changelog.d/10269.misc b/changelog.d/10269.misc
new file mode 100644
index 0000000000..23e590490c
--- /dev/null
+++ b/changelog.d/10269.misc
@@ -0,0 +1 @@
+Add a distributed lock implementation.
diff --git a/changelog.d/10272.bugfix b/changelog.d/10272.bugfix
new file mode 100644
index 0000000000..3cefa05788
--- /dev/null
+++ b/changelog.d/10272.bugfix
@@ -0,0 +1 @@
+Handle inbound events from federation asynchronously.