summary refs log tree commit diff
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2018-09-19 14:45:14 +0100
committerErik Johnston <erik@matrix.org>2018-09-19 14:45:14 +0100
commitbbab6ebfd9257ba9ad5e576c4b9b8bdea1c166cf (patch)
tree60bb6ad937c62dd942ca38aa6fa28cb9978682f0
parentpep8 (diff)
downloadsynapse-bbab6ebfd9257ba9ad5e576c4b9b8bdea1c166cf.tar.xz
Fix up changelog and remove spurious comment
-rw-r--r--changelog.d/3914.bugfix2
-rw-r--r--synapse/storage/transactions.py2
2 files changed, 1 insertions, 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,