diff options
| author | Erik Johnston <erik@matrix.org> | 2017-04-11 11:12:37 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2017-04-11 11:12:37 +0100 |
| commit | 4902db1fc978d1c9a3681720cffc4dbb9d72dbea (patch) | |
| tree | ee78b86f62119a7605ab2fdd1bc8afd3953e7978 /synapse/replication/resource.py | |
| parent | Merge branch 'release-v0.19.3' of github.com:matrix-org/synapse (diff) | |
| parent | Bump changelog (diff) | |
| download | synapse-4902db1fc978d1c9a3681720cffc4dbb9d72dbea.tar.xz | |
Merge branch 'release-v0.20.0' of github.com:matrix-org/synapse v0.20.0
Diffstat (limited to 'synapse/replication/resource.py')
| -rw-r--r-- | synapse/replication/resource.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/synapse/replication/resource.py b/synapse/replication/resource.py index d8eb14592b..03930fe958 100644 --- a/synapse/replication/resource.py +++ b/synapse/replication/resource.py @@ -283,12 +283,12 @@ class ReplicationResource(Resource): if request_events != upto_events_token: writer.write_header_and_rows("events", res.new_forward_events, ( - "position", "internal", "json", "state_group" + "position", "event_id", "room_id", "type", "state_key", ), position=upto_events_token) if request_backfill != upto_backfill_token: writer.write_header_and_rows("backfill", res.new_backfill_events, ( - "position", "internal", "json", "state_group", + "position", "event_id", "room_id", "type", "state_key", "redacts", ), position=upto_backfill_token) writer.write_header_and_rows( |