summary refs log tree commit diff
diff options
context:
space:
mode:
authorNeil Johnson <neil@fragile.org.uk>2018-05-14 17:49:59 +0100
committerNeil Johnson <neil@fragile.org.uk>2018-05-14 17:49:59 +0100
commit589ecc5b5800a86406a0d1464fd6974c029a1163 (patch)
tree99a89d1bd6206368b8ac60f5bdd10e4f804f674c
parentrearrange and collect related PRs (diff)
downloadsynapse-589ecc5b5800a86406a0d1464fd6974c029a1163.tar.xz
further musical chairs
-rw-r--r--CHANGES.rst5
1 files changed, 3 insertions, 2 deletions
diff --git a/CHANGES.rst b/CHANGES.rst
index aed8525f2d..78d015db9a 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -26,11 +26,9 @@ Changes - General:
 * Part user from rooms on account deactivate (PR #3201)
 * Make 'unexpected logging context' into warnings (PR #3007)
 * Set Server header in SynapseRequest (PR #3208)
-* Use deferred.addTimeout instead of time_bound_deferred (PR #3127, #3178)
 * remove duplicates from groups tables (PR #3129)
 * Improve exception handling for background processes (PR #3138)
 * Add missing consumeErrors to improve exception handling (PR #3139)
-* Use run_in_background in preference to preserve_fn (PR #3140)
 * reraise exceptions more carefully (PR #3142)
 * Remove redundant call to preserve_fn (PR #3143)
 * Trap exceptions thrown within run_in_background (PR #3144)
@@ -46,6 +44,9 @@ Changes - Refactors:
 * Refactor request handling wrappers (PR #3203)
 * transaction_id, destination defined twice (PR #3209) Thanks to @damir-manapov!
 * Refactor event storage to prepare for changes in state calculations (PR #3141)
+* Set Server header in SynapseRequest (PR #3208)
+* Use deferred.addTimeout instead of time_bound_deferred (PR #3127, #3178)
+* Use run_in_background in preference to preserve_fn (PR #3140)
 
 Changes - Python 3 migration: