diff options
author | Richard van der Hoff <richard@matrix.org> | 2020-05-06 11:58:31 +0100 |
---|---|---|
committer | Richard van der Hoff <richard@matrix.org> | 2020-05-06 11:58:31 +0100 |
commit | 2e0c46ca07564d9592e5ec7d260e40c0659daa80 (patch) | |
tree | 598b91e8ee09902969038d9e1616471a7108adfe /changelog.d | |
parent | Merge pull request #7429 from matrix-org/rav/upsert_for_device_list (diff) | |
parent | Move logs about discarded RDATA to debug (#7421) (diff) | |
download | synapse-2e0c46ca07564d9592e5ec7d260e40c0659daa80.tar.xz |
Merge branch 'release-v1.13.0' into develop
Diffstat (limited to 'changelog.d')
-rw-r--r-- | changelog.d/7393.bugfix | 1 | ||||
-rw-r--r-- | changelog.d/7408.misc | 1 | ||||
-rw-r--r-- | changelog.d/7421.misc | 1 |
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. |