diff options
author | Patrick Cloke <patrickc@matrix.org> | 2022-03-16 12:22:07 -0400 |
---|---|---|
committer | Patrick Cloke <patrickc@matrix.org> | 2022-03-16 12:22:07 -0400 |
commit | 3f7cfbc9e5e82d17cd7782adcbe78e239aae5691 (patch) | |
tree | 35aaeba932f2ab5bd614ab9a946fe7967b6fca3e /changelog.d/12180.misc | |
parent | Handle cancellation in `DatabasePool.runInteraction()` (#12199) (diff) | |
parent | Re-generate changelog. (diff) | |
download | synapse-3f7cfbc9e5e82d17cd7782adcbe78e239aae5691.tar.xz |
Merge branch 'release-v1.55' into develop
Diffstat (limited to 'changelog.d/12180.misc')
-rw-r--r-- | changelog.d/12180.misc | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/changelog.d/12180.misc b/changelog.d/12180.misc deleted file mode 100644 index 7a347352fd..0000000000 --- a/changelog.d/12180.misc +++ /dev/null @@ -1 +0,0 @@ -Add `delay_cancellation` utility function, which behaves like `stop_cancellation` but waits until the original `Deferred` resolves before raising a `CancelledError`. |