Merge branch 'develop' of github.com:matrix-org/synapse into erikj/speed_up_calculate_state_delta

3 files changed, 3 insertions, 0 deletions

diff --git a/changelog.d/3555.feature b/changelog.d/3555.feature
new file mode 100644

index 0000000000..ea4a85e0ae
--- /dev/null
+++ b/changelog.d/3555.feature
@@ -0,0 +1 @@
+Add support for client_reader to handle more APIs
diff --git a/changelog.d/3590.misc b/changelog.d/3590.misc
new file mode 100644

index 0000000000..0f1688fd0f
--- /dev/null
+++ b/changelog.d/3590.misc
@@ -0,0 +1 @@
+Add some measure blocks to persist_events
diff --git a/changelog.d/3591.misc b/changelog.d/3591.misc
new file mode 100644

index 0000000000..f0137766a0
--- /dev/null
+++ b/changelog.d/3591.misc
@@ -0,0 +1 @@
+Fix some random logcontext leaks.
\ No newline at end of file