summary refs log tree commit diff
diff options
context:
space:
mode:
authorH. Shay <hillerys@element.io>2022-02-14 10:21:00 -0800
committerH. Shay <hillerys@element.io>2022-02-14 10:21:00 -0800
commit9c4563c5cd97dbcfe3eb43e05b30ca3c830d6937 (patch)
treefff1d71e3bb288b02aef6139fee376a885f5b13f
parent Require that modules register their callbacks using keyword arguments. (#11975) (diff)
downloadsynapse-9c4563c5cd97dbcfe3eb43e05b30ca3c830d6937.tar.xz
remove empty file, reword/rename newsfragment, and add line to upgrade doc
-rw-r--r--changelog.d/11849.feature1
-rw-r--r--changelog.d/11849.misc1
-rw-r--r--docs/upgrade.md1
-rw-r--r--synapse/config/background_updates.py0
4 files changed, 2 insertions, 1 deletions
diff --git a/changelog.d/11849.feature b/changelog.d/11849.feature
new file mode 100644
index 0000000000..6c6b57a774
--- /dev/null
+++ b/changelog.d/11849.feature
@@ -0,0 +1 @@
+Enable cache time-based expiry by default. The `expiry_time` config flag has been superseded by `expire_caches` and `cache_entry_ttl`.
diff --git a/changelog.d/11849.misc b/changelog.d/11849.misc
deleted file mode 100644
index 9561eab192..0000000000
--- a/changelog.d/11849.misc
+++ /dev/null
@@ -1 +0,0 @@
-Enable cache time-based expiry by default. The `expiry_time` config flag will be superseded by `expire_caches` and `cache_entry_ttl`.
diff --git a/docs/upgrade.md b/docs/upgrade.md
index 25a86c08e6..a5da0076c6 100644
--- a/docs/upgrade.md
+++ b/docs/upgrade.md
@@ -117,6 +117,7 @@ Formerly, entries in the cache were not evicted regardless of whether they were
 This behavior has now changed. By default entries in the cache are now evicted after 30m of not being accessed. 
 To change the default behavior, go to the `caches` section of the config and change the `expire_caches` and 
 `cache_entry_ttl` flags as necessary. Please note that these flags replace the `expiry_time` flag in the config.  
+The `expiry_time` flag will still continue to work, but it has been deprecated and will be removed in the future.
 
 ## Deprecation of `capability` `org.matrix.msc3283.*`
 
diff --git a/synapse/config/background_updates.py b/synapse/config/background_updates.py
deleted file mode 100644
index e69de29bb2..0000000000
--- a/synapse/config/background_updates.py
+++ /dev/null