summary refs log tree commit diff
path: root/changelog.d
diff options
context:
space:
mode:
authorRichard van der Hoff <1389908+richvdh@users.noreply.github.com>2018-07-20 14:44:02 +0100
committerGitHub <noreply@github.com>2018-07-20 14:44:02 +0100
commitff48ab8527fb51c338ae79c583583f000263c453 (patch)
tree899ddb3c55d95502cd1d6b93a8f3b78edb8a7e79 /changelog.d
parentMerge pull request #3571 from matrix-org/rav/limiter_fixes (diff)
parentChangelog (diff)
downloadsynapse-ff48ab8527fb51c338ae79c583583f000263c453.tar.xz
Merge pull request #3572 from matrix-org/rav/linearizer_cancellation
Test and fix support for cancellation in Linearizer
Diffstat (limited to 'changelog.d')
-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