summary refs log tree commit diff
path: root/changelog.d
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2021-10-12 14:41:13 +0100
committerErik Johnston <erik@matrix.org>2021-10-12 14:41:13 +0100
commit77ea03086c43f6ecbc894c9dfd03cd589031fa2a (patch)
treee92c2931b51e61064a8a23d5b527a9da4d3b4a3a /changelog.d
parentAdd type hints to `synapse.storage.databases.main.client_ips` (#10972) (diff)
parentFix race in `MultiWriterIdGenerator` (#11045) (diff)
downloadsynapse-77ea03086c43f6ecbc894c9dfd03cd589031fa2a.tar.xz
Merge remote-tracking branch 'origin/release-v1.45' into develop
Diffstat (limited to 'changelog.d')
-rw-r--r--changelog.d/11036.misc1
-rw-r--r--changelog.d/11045.bugfix1
2 files changed, 2 insertions, 0 deletions
diff --git a/changelog.d/11036.misc b/changelog.d/11036.misc
new file mode 100644
index 0000000000..aae5ee62b2
--- /dev/null
+++ b/changelog.d/11036.misc
@@ -0,0 +1 @@
+Ensure that cache config tests do not share state.
diff --git a/changelog.d/11045.bugfix b/changelog.d/11045.bugfix
new file mode 100644
index 0000000000..d712dc946a
--- /dev/null
+++ b/changelog.d/11045.bugfix
@@ -0,0 +1 @@
+Fix a long-standing bug when using multiple event persister workers where events were not correctly sent down `/sync` due to a race.