summary refs log tree commit diff
path: root/synapse/federation/transaction_queue.py
diff options
context:
space:
mode:
authorMark Haines <mark.haines@matrix.org>2016-09-09 18:51:22 +0100
committerMark Haines <mark.haines@matrix.org>2016-09-09 18:51:22 +0100
commit3ddec016ffe5a624673b5c5d9573fb11851963b9 (patch)
tree798cf69b1aeeffb673a0aaad2a2a869f1224ebd6 /synapse/federation/transaction_queue.py
parentAllow clients to supply access_tokens as headers (diff)
parentMerge pull request #1096 from matrix-org/markjh/get_access_token (diff)
downloadsynapse-3ddec016ffe5a624673b5c5d9573fb11851963b9.tar.xz
Merge branch 'develop' into markjh/bearer_token
Diffstat (limited to 'synapse/federation/transaction_queue.py')
-rw-r--r--synapse/federation/transaction_queue.py1
1 files changed, 0 insertions, 1 deletions
diff --git a/synapse/federation/transaction_queue.py b/synapse/federation/transaction_queue.py

index d9b8b3fc1d..1ac569b305 100644 --- a/synapse/federation/transaction_queue.py +++ b/synapse/federation/transaction_queue.py
@@ -229,7 +229,6 @@ class TransactionQueue(object): "dropping transaction for now", destination, ) - success = False finally: # We want to be *very* sure we delete this after we stop processing self.pending_transactions.pop(destination, None)