summary refs log tree commit diff
path: root/synapse/replication/http/_base.py
diff options
context:
space:
mode:
authorDavid Robertson <davidr@element.io>2023-10-24 14:23:19 +0100
committerDavid Robertson <davidr@element.io>2023-10-24 14:23:19 +0100
commitc0d2f7649e2951ed8a91532adf1f6acceeb0f06f (patch)
tree92dfd202e2316fa3bf3f33c47433de651dd0e880 /synapse/replication/http/_base.py
parentAdd test case to detect dodgy b64 encoding (diff)
parentRework alias and public room list rules docs (#16541) (diff)
downloadsynapse-c0d2f7649e2951ed8a91532adf1f6acceeb0f06f.tar.xz
Merge branch 'develop' of github.com:matrix-org/synapse into develop
Diffstat (limited to 'synapse/replication/http/_base.py')
-rw-r--r--synapse/replication/http/_base.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/replication/http/_base.py b/synapse/replication/http/_base.py

index 63cf24a14d..7476839db5 100644 --- a/synapse/replication/http/_base.py +++ b/synapse/replication/http/_base.py
@@ -238,7 +238,7 @@ class ReplicationEndpoint(metaclass=abc.ABCMeta): data[_STREAM_POSITION_KEY] = { "streams": { - stream.NAME: stream.current_token(local_instance_name) + stream.NAME: stream.minimal_local_current_token() for stream in streams }, "instance_name": local_instance_name,