diff options
| author | Mark Haines <mark.haines@matrix.org> | 2014-10-17 17:33:58 +0100 |
|---|---|---|
| committer | Mark Haines <mark.haines@matrix.org> | 2014-10-17 17:33:58 +0100 |
| commit | dc3c2823ac425c9b5bbe6883b7d33a12059a08fb (patch) | |
| tree | 22d02a68df93c3f98b0be7de8a07040268420369 /synapse/federation/persistence.py | |
| parent | Rename 'meta' to 'unsigned' (diff) | |
| parent | keep 'origin_server_ts' as 'ts' in the database to avoid needlessly updating ... (diff) | |
| download | synapse-dc3c2823ac425c9b5bbe6883b7d33a12059a08fb.tar.xz | |
Merge branch 'develop' into event_signing
Conflicts: synapse/federation/replication.py
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] ) |