From bbab6ebfd9257ba9ad5e576c4b9b8bdea1c166cf Mon Sep 17 00:00:00 2001
From: Erik Johnston <erik@matrix.org>
Date: Wed, 19 Sep 2018 14:45:14 +0100
Subject: [PATCH] Fix up changelog and remove spurious comment
---
changelog.d/3914.bugfix | 2 +-
synapse/storage/transactions.py | 2 --
2 files changed, 1 insertion(+), 3 deletions(-)
diff --git a/changelog.d/3914.bugfix b/changelog.d/3914.bugfix
index 60fb8ec1ae..27e6bad590 100644
--- a/changelog.d/3914.bugfix
+++ b/changelog.d/3914.bugfix
@@ -1 +1 @@
-Fix bug where outboud federation would stop talking to some servers when using workers
+Fix bug where outbound federation would stop talking to some servers when using workers
diff --git a/synapse/storage/transactions.py b/synapse/storage/transactions.py
index 449bdc1e49..baf0379a68 100644
--- a/synapse/storage/transactions.py
+++ b/synapse/storage/transactions.py
@@ -196,8 +196,6 @@ class TransactionStore(SQLBaseStore):
retry_interval (int) - how long until next retry in ms
"""
- # XXX: we could chose to not bother persisting this if our cache thinks
- # this is a NOOP
return self.runInteraction(
"set_destination_retry_timings",
self._set_destination_retry_timings,
--
GitLab