summary refs log tree commit diff
path: root/changelog.d
diff options
context:
space:
mode:
authorAndrew Morgan <1342360+anoadragon453@users.noreply.github.com>2019-01-24 15:24:35 +0000
committerGitHub <noreply@github.com>2019-01-24 15:24:35 +0000
commit50c396a7eefb31c2ccfe272a6e796ef9b0a161ca (patch)
tree00835317b059d534c3e19aa22cf27cc4f2957f89 /changelog.d
parentMerge pull request #4464 from matrix-org/rav/fix_srv_lookup (diff)
parentChange default timeout value from 0 to None (diff)
downloadsynapse-50c396a7eefb31c2ccfe272a6e796ef9b0a161ca.tar.xz
Merge pull request #4461 from matrix-org/anoa/room_dir_quick_fix
Add a 60s timeout to filtered room directory queries
Diffstat (limited to 'changelog.d')
-rw-r--r--changelog.d/4461.bugfix1
1 files changed, 1 insertions, 0 deletions
diff --git a/changelog.d/4461.bugfix b/changelog.d/4461.bugfix
new file mode 100644
index 0000000000..92062a2bfb
--- /dev/null
+++ b/changelog.d/4461.bugfix
@@ -0,0 +1 @@
+Add a timeout to filtered room directory queries.
\ No newline at end of file