remove empty file, reword/rename newsfragment, and add line to upgrad…

…e doc
matrix-org · Feb 14, 2022 · 9c4563c · 9c4563c
1 parent 738e569
commit 9c4563c
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 1 deletion.
diff --git a/changelog.d/11849.feature 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
diff --git 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
Original file line number	Diff line number	Diff line change
		@@ -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`.