diff options
| author | Richard van der Hoff <richard@matrix.org> | 2016-03-03 11:39:25 +0000 |
|---|---|---|
| committer | Richard van der Hoff <richard@matrix.org> | 2016-03-03 11:39:25 +0000 |
| commit | 79f34bdbc2720a832cdab36ba58e83201e549c41 (patch) | |
| tree | 2bdadb2bd2d2dac1a6722c4d33ca81febb7d7ece /synapse/storage/transactions.py | |
| parent | Fix typo (diff) | |
| parent | jenkins.sh: set -x (diff) | |
| download | synapse-79f34bdbc2720a832cdab36ba58e83201e549c41.tar.xz | |
Merge branch 'develop' into rav/SYN-642
Diffstat (limited to 'synapse/storage/transactions.py')
| -rw-r--r-- | synapse/storage/transactions.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/storage/transactions.py b/synapse/storage/transactions.py index 4475c451c1..d338dfcf0a 100644 --- a/synapse/storage/transactions.py +++ b/synapse/storage/transactions.py @@ -117,7 +117,7 @@ class TransactionStore(SQLBaseStore): def _prep_send_transaction(self, txn, transaction_id, destination, origin_server_ts): - next_id = self._transaction_id_gen.get_next_txn(txn) + next_id = self._transaction_id_gen.get_next() # First we find out what the prev_txns should be. # Since we know that we are only sending one transaction at a time, |