diff options
| author | Neil Johnson <neil@matrix.org> | 2018-08-16 11:37:17 +0100 |
|---|---|---|
| committer | Neil Johnson <neil@matrix.org> | 2018-08-16 11:37:17 +0100 |
| commit | 25d2b5d55ffc02f9fd2a4511c3d6c1d0ffff8a6a (patch) | |
| tree | 64576e7083a569f13765c8d3a41fe6326ac631fa /synapse/storage/stream.py | |
| parent | WIP impl commiting to get feedback (diff) | |
| parent | initial cut at a room summary API (#3574) (diff) | |
| download | synapse-25d2b5d55ffc02f9fd2a4511c3d6c1d0ffff8a6a.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into neilj/server_notices_on_blocking
Diffstat (limited to 'synapse/storage/stream.py')
| -rw-r--r-- | synapse/storage/stream.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/synapse/storage/stream.py b/synapse/storage/stream.py index b9f2b74ac6..4c296d72c0 100644 --- a/synapse/storage/stream.py +++ b/synapse/storage/stream.py @@ -348,7 +348,7 @@ class StreamWorkerStore(EventsWorkerStore, SQLBaseStore): end_token (str): The stream token representing now. Returns: - Deferred[tuple[list[FrozenEvent], str]]: Returns a list of + Deferred[tuple[list[FrozenEvent], str]]: Returns a list of events and a token pointing to the start of the returned events. The events returned are in ascending order. @@ -379,7 +379,7 @@ class StreamWorkerStore(EventsWorkerStore, SQLBaseStore): end_token (str): The stream token representing now. Returns: - Deferred[tuple[list[_EventDictReturn], str]]: Returns a list of + Deferred[tuple[list[_EventDictReturn], str]]: Returns a list of _EventDictReturn and a token pointing to the start of the returned events. The events returned are in ascending order. |