summary refs log tree commit diff
path: root/synapse/federation/persistence.py
diff options
context:
space:
mode:
authorMark Haines <mark.haines@matrix.org>2014-10-17 17:12:25 +0100
committerMark Haines <mark.haines@matrix.org>2014-10-17 17:12:25 +0100
commitf5cf7ac25b311fda8a2d553f07437b3648c66f6c (patch)
tree62d43c8acf91281f59239f331745e9796a0f827e /synapse/federation/persistence.py
parentSPEC-7: Don't stamp event contents with 'hsob_ts' (diff)
downloadsynapse-f5cf7ac25b311fda8a2d553f07437b3648c66f6c.tar.xz
SPEC-7: Rename 'ts' to 'origin_server_ts'
Diffstat (limited to 'synapse/federation/persistence.py')
-rw-r--r--synapse/federation/persistence.py2
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]
         )