summary refs log tree commit diff
diff options
context:
space:
mode:
authorRichard van der Hoff <richard@matrix.org>2018-07-20 14:01:36 +0100
committerRichard van der Hoff <richard@matrix.org>2018-07-20 14:01:36 +0100
commit5c30cb709af1295b2285d802d1e40b91382e7af0 (patch)
tree899ddb3c55d95502cd1d6b93a8f3b78edb8a7e79
parentTest and fix support for cancellation in Linearizer (diff)
downloadsynapse-5c30cb709af1295b2285d802d1e40b91382e7af0.tar.xz
Changelog
-rw-r--r--changelog.d/3572.misc1
1 files changed, 1 insertions, 0 deletions
diff --git a/changelog.d/3572.misc b/changelog.d/3572.misc
new file mode 100644
index 0000000000..8908324e68
--- /dev/null
+++ b/changelog.d/3572.misc
@@ -0,0 +1 @@
+Merge Linearizer and Limiter