summary refs log tree commit diff
path: root/synapse/federation/units.py
diff options
context:
space:
mode:
authorMark Haines <mark.haines@matrix.org>2014-10-17 17:31:48 +0100
committerMark Haines <mark.haines@matrix.org>2014-10-17 17:31:48 +0100
commit82c582076782f180c9f69a523953c3a36b57b3ac (patch)
tree00a79bdfe56a139cbe427ecc28bad852bdc3663d /synapse/federation/units.py
parentSPEC-7: Rename 'ts' to 'origin_server_ts' (diff)
downloadsynapse-82c582076782f180c9f69a523953c3a36b57b3ac.tar.xz
keep 'origin_server_ts' as 'ts' in the database to avoid needlessly updating schema
Diffstat (limited to 'synapse/federation/units.py')
-rw-r--r--synapse/federation/units.py1
1 files changed, 1 insertions, 0 deletions
diff --git a/synapse/federation/units.py b/synapse/federation/units.py

index dccac2aca7..b2fb964180 100644 --- a/synapse/federation/units.py +++ b/synapse/federation/units.py
@@ -118,6 +118,7 @@ class Pdu(JsonEncodedObject): """ if pdu_tuple: d = copy.copy(pdu_tuple.pdu_entry._asdict()) + d["origin_server_ts"] = d.pop("ts") d["content"] = json.loads(d["content_json"]) del d["content_json"]