summary refs log tree commit diff
diff options
context:
space:
mode:
authorRichard van der Hoff <richard@matrix.org>2018-07-20 13:16:39 +0100
committerRichard van der Hoff <richard@matrix.org>2018-07-20 13:16:39 +0100
commit683f4058c18c51bd84d99faa9b64bd81c57ee8cb (patch)
tree209c1a247d7ff795ff9fd16bb18360c9d47ce999
parentCombine Limiter and Linearizer (diff)
downloadsynapse-683f4058c18c51bd84d99faa9b64bd81c57ee8cb.tar.xz
changelogs
-rw-r--r--changelog.d/3570.bugfix1
-rw-r--r--changelog.d/3571.misc1
2 files changed, 2 insertions, 0 deletions
diff --git a/changelog.d/3570.bugfix b/changelog.d/3570.bugfix
new file mode 100644
index 0000000000..cec5158a99
--- /dev/null
+++ b/changelog.d/3570.bugfix
@@ -0,0 +1 @@
+Fix potential stack overflow and deadlock under heavy load
\ No newline at end of file
diff --git a/changelog.d/3571.misc b/changelog.d/3571.misc
new file mode 100644
index 0000000000..8908324e68
--- /dev/null
+++ b/changelog.d/3571.misc
@@ -0,0 +1 @@
+Merge Linearizer and Limiter