summary refs log tree commit diff
path: root/synapse/replication/resource.py
diff options
context:
space:
mode:
authorMark Haines <mark.haines@matrix.org>2016-05-13 16:59:56 +0100
committerMark Haines <mark.haines@matrix.org>2016-05-13 16:59:56 +0100
commit1f71f386f68423c00e0d4180ae48b271864b42a5 (patch)
tree9dd45307ffd592023a8334e90d2c2180f4463225 /synapse/replication/resource.py
parentShift some of the state_group methods into the SlavedEventStore (diff)
parentMerge pull request #783 from matrix-org/markjh/slave_account_data (diff)
downloadsynapse-1f71f386f68423c00e0d4180ae48b271864b42a5.tar.xz
Merge branch 'develop' into dbkr/email_notifs_on_pusher
Diffstat (limited to 'synapse/replication/resource.py')
-rw-r--r--synapse/replication/resource.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/replication/resource.py b/synapse/replication/resource.py

index 69ad1de863..0e983ae7fa 100644 --- a/synapse/replication/resource.py +++ b/synapse/replication/resource.py
@@ -164,8 +164,8 @@ class ReplicationResource(Resource): "Replicating %d rows of %s from %s -> %s", len(stream_content["rows"]), stream_name, - stream_content["position"], request_streams.get(stream_name), + stream_content["position"], ) request.write(json.dumps(result, ensure_ascii=False))