diff options
| author | Erik Johnston <erik@matrix.org> | 2014-10-17 21:02:16 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2014-10-17 21:02:16 +0100 |
| commit | 449739e6a364759a86f73417626af49d6a794e3d (patch) | |
| tree | 04b2f39c91ec6098ffe3b380442787ac3ce2908f /synapse/federation/persistence.py | |
| parent | Merge branch 'release-v0.3.4' of github.com:matrix-org/synapse (diff) | |
| parent | Check that we have auth headers and fail nicely (diff) | |
| download | synapse-449739e6a364759a86f73417626af49d6a794e3d.tar.xz | |
Merge branch 'release-v0.4.0' of github.com:matrix-org/synapse
Diffstat (limited to 'synapse/federation/persistence.py')
| -rw-r--r-- | synapse/federation/persistence.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/federation/persistence.py b/synapse/federation/persistence.py index de36a80e41..7043fcc504 100644 --- a/synapse/federation/persistence.py +++ b/synapse/federation/persistence.py @@ -157,7 +157,7 @@ class TransactionActions(object): transaction.prev_ids = yield self.store.prep_send_transaction( transaction.transaction_id, transaction.destination, - transaction.ts, + transaction.origin_server_ts, [(p["pdu_id"], p["origin"]) for p in transaction.pdus] ) |