diff options
| author | Erik Johnston <erik@matrix.org> | 2016-02-10 14:12:48 +0000 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2016-02-10 14:12:48 +0000 |
| commit | e66d0bd03abc75b5a0445acadc776ba23e1090ba (patch) | |
| tree | d73f7c0c2621a27c1637223213a930e40140728d /synapse/federation/transaction_queue.py | |
| parent | Update CHANGES (diff) | |
| parent | Merge pull request #569 from matrix-org/erikj/initial_sync (diff) | |
| download | synapse-e66d0bd03abc75b5a0445acadc776ba23e1090ba.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into release-v0.13.0
Diffstat (limited to 'synapse/federation/transaction_queue.py')
| -rw-r--r-- | synapse/federation/transaction_queue.py | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/synapse/federation/transaction_queue.py b/synapse/federation/transaction_queue.py index 622adad3ae..1928da03b3 100644 --- a/synapse/federation/transaction_queue.py +++ b/synapse/federation/transaction_queue.py @@ -103,7 +103,6 @@ class TransactionQueue(object): else: return not destination.startswith("localhost") - @defer.inlineCallbacks def enqueue_pdu(self, pdu, destinations, order): # We loop through all destinations to see whether we already have # a transaction in progress. If we do, stick it in the pending_pdus @@ -141,8 +140,6 @@ class TransactionQueue(object): deferreds.append(deferred) - yield defer.DeferredList(deferreds, consumeErrors=True) - # NO inlineCallbacks def enqueue_edu(self, edu): destination = edu.destination |