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/storage/__init__.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/storage/__init__.py')
| -rw-r--r-- | synapse/storage/__init__.py | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/synapse/storage/__init__.py b/synapse/storage/__init__.py index 1738260cc1..e4f708b6ad 100644 --- a/synapse/storage/__init__.py +++ b/synapse/storage/__init__.py @@ -163,6 +163,8 @@ class DataStore(RoomMemberStore, RoomStore, cols["unrecognized_keys"] = json.dumps(unrec_keys) + cols["ts"] = cols.pop("origin_server_ts") + logger.debug("Persisting: %s", repr(cols)) for hash_alg, hash_base64 in pdu.hashes.items(): |