summary refs log tree commit diff
path: root/changelog.d
diff options
context:
space:
mode:
authorRichard van der Hoff <richard@matrix.org>2020-05-06 11:58:31 +0100
committerRichard van der Hoff <richard@matrix.org>2020-05-06 11:58:31 +0100
commit2e0c46ca07564d9592e5ec7d260e40c0659daa80 (patch)
tree598b91e8ee09902969038d9e1616471a7108adfe /changelog.d
parentMerge pull request #7429 from matrix-org/rav/upsert_for_device_list (diff)
parentMove logs about discarded RDATA to debug (#7421) (diff)
downloadsynapse-2e0c46ca07564d9592e5ec7d260e40c0659daa80.tar.xz
Merge branch 'release-v1.13.0' into develop
Diffstat (limited to 'changelog.d')
-rw-r--r--changelog.d/7393.bugfix1
-rw-r--r--changelog.d/7408.misc1
-rw-r--r--changelog.d/7421.misc1
3 files changed, 3 insertions, 0 deletions
diff --git a/changelog.d/7393.bugfix b/changelog.d/7393.bugfix
new file mode 100644

index 0000000000..74419af858 --- /dev/null +++ b/changelog.d/7393.bugfix
@@ -0,0 +1 @@ +Fix bug in `EventContext.deserialize`. diff --git a/changelog.d/7408.misc b/changelog.d/7408.misc new file mode 100644
index 0000000000..731f4dcb52 --- /dev/null +++ b/changelog.d/7408.misc
@@ -0,0 +1 @@ +Clean up some LoggingContext code. diff --git a/changelog.d/7421.misc b/changelog.d/7421.misc new file mode 100644
index 0000000000..676f285377 --- /dev/null +++ b/changelog.d/7421.misc
@@ -0,0 +1 @@ +Move catchup of replication streams logic to worker.