summary refs log tree commit diff
path: root/changelog.d
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2019-01-25 14:11:17 +0000
committerErik Johnston <erik@matrix.org>2019-01-25 14:11:17 +0000
commit431e485914b01eb1b245e37df814ff5bac110be1 (patch)
tree1262900b08616aa08768d9883349b11725218528 /changelog.d
parentNewsfile (diff)
parentFix quoting for allowed_local_3pids example config (#4476) (diff)
downloadsynapse-431e485914b01eb1b245e37df814ff5bac110be1.tar.xz
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/sqlite_native_upsert
Diffstat (limited to 'changelog.d')
-rw-r--r--changelog.d/4415.feature1
-rw-r--r--changelog.d/4466.misc1
-rw-r--r--changelog.d/4468.misc1
-rw-r--r--changelog.d/4476.misc1
4 files changed, 4 insertions, 0 deletions
diff --git a/changelog.d/4415.feature b/changelog.d/4415.feature
new file mode 100644
index 0000000000..1fb1d58f8f
--- /dev/null
+++ b/changelog.d/4415.feature
@@ -0,0 +1 @@
+Search now includes results from predecessor rooms after a room upgrade.
\ No newline at end of file
diff --git a/changelog.d/4466.misc b/changelog.d/4466.misc
new file mode 100644
index 0000000000..58130b6190
--- /dev/null
+++ b/changelog.d/4466.misc
@@ -0,0 +1 @@
+Synapse will now take advantage of native UPSERT functionality in PostgreSQL 9.5+ and SQLite 3.24+.
diff --git a/changelog.d/4468.misc b/changelog.d/4468.misc
new file mode 100644
index 0000000000..9a51434755
--- /dev/null
+++ b/changelog.d/4468.misc
@@ -0,0 +1 @@
+Move SRV logic into the Agent layer
diff --git a/changelog.d/4476.misc b/changelog.d/4476.misc
new file mode 100644
index 0000000000..a070e10c7c
--- /dev/null
+++ b/changelog.d/4476.misc
@@ -0,0 +1 @@
+Fix quoting for allowed_local_3pids example config