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/replication.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/replication.py')
| -rw-r--r-- | synapse/federation/replication.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/synapse/federation/replication.py b/synapse/federation/replication.py index f2a5d4d5e2..4a9414c1d4 100644 --- a/synapse/federation/replication.py +++ b/synapse/federation/replication.py @@ -427,7 +427,7 @@ class ReplicationLayer(object): return Transaction( origin=self.server_name, pdus=pdus, - ts=int(time_now), + origin_server_ts=int(time_now), destination=None, ) @@ -595,7 +595,7 @@ class _TransactionQueue(object): logger.debug("TX [%s] Persisting transaction...", destination) transaction = Transaction.create_new( - ts=int(self._clock.time_msec()), + origin_server_ts=int(self._clock.time_msec()), transaction_id=str(self._next_txn_id), origin=self.server_name, destination=destination, |