summary refs log tree commit diff
path: root/changelog.d
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2023-01-17 09:29:58 +0000
committerGitHub <noreply@github.com>2023-01-17 09:29:58 +0000
commit2b084c5b710d9630178484e6ade597ca7fa814b6 (patch)
treed80e5964b12d2e3710dfe49186fb0229c4afc1dc /changelog.d
parentAdd parameter to control whether we do a partial state join (#14843) (diff)
downloadsynapse-2b084c5b710d9630178484e6ade597ca7fa814b6.tar.xz
Merge device list replication streams (#14833)
Diffstat (limited to 'changelog.d')
-rw-r--r--changelog.d/14826.misc2
-rw-r--r--changelog.d/14833.misc1
2 files changed, 2 insertions, 1 deletions
diff --git a/changelog.d/14826.misc b/changelog.d/14826.misc
index 9ebedcf51e..e80673a721 100644
--- a/changelog.d/14826.misc
+++ b/changelog.d/14826.misc
@@ -1 +1 @@
-Merge tag and normal account data replication streams.
+Merge the two account data and the two device list replication streams.
diff --git a/changelog.d/14833.misc b/changelog.d/14833.misc
new file mode 100644
index 0000000000..e80673a721
--- /dev/null
+++ b/changelog.d/14833.misc
@@ -0,0 +1 @@
+Merge the two account data and the two device list replication streams.