summary refs log tree commit diff
path: root/synapse/config/database.py
diff options
context:
space:
mode:
authorRichard van der Hoff <richard@matrix.org>2019-03-19 12:19:20 +0000
committerRichard van der Hoff <richard@matrix.org>2019-03-19 12:19:20 +0000
commit2561b628af267ab567118a3e40038504c60acf41 (patch)
treee283996a2db1e6fa540c1ae963ca7c03903d06cc /synapse/config/database.py
parentRevert "Reinstate EDU-batching hacks" (diff)
parentfix test_auto_create_auto_join_where_no_consent (#4886) (diff)
downloadsynapse-2561b628af267ab567118a3e40038504c60acf41.tar.xz
Merge branch 'develop' into matrix-org-hotfixes
Diffstat (limited to 'synapse/config/database.py')
-rw-r--r--synapse/config/database.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/synapse/config/database.py b/synapse/config/database.py

index 63e9cb63f8..3c27ed6b4a 100644 --- a/synapse/config/database.py +++ b/synapse/config/database.py
@@ -60,7 +60,8 @@ class DatabaseConfig(Config): database: "%(database_path)s" # Number of events to cache in memory. - event_cache_size: "10K" + # + #event_cache_size: 10K """ % locals() def read_arguments(self, args):