diff options
| author | David Baker <dbkr@matrix.org> | 2014-12-02 13:50:05 +0000 |
|---|---|---|
| committer | David Baker <dbkr@matrix.org> | 2014-12-02 13:50:05 +0000 |
| commit | 7642d95d5e90bab130b33dc27f10e347072e0294 (patch) | |
| tree | 08c618bc5daeceb90bb8a47e3800b88c12d83427 /synapse/storage/stream.py | |
| parent | More work on pushers. Attempt to do HTTP pokes. Not sure if the actual HTTP p... (diff) | |
| parent | Add non-working jitsi meet bridge (diff) | |
| download | synapse-7642d95d5e90bab130b33dc27f10e347072e0294.tar.xz | |
Merge branch 'develop' into pushers
Diffstat (limited to 'synapse/storage/stream.py')
| -rw-r--r-- | synapse/storage/stream.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/storage/stream.py b/synapse/storage/stream.py index b84735e61c..3405cb365e 100644 --- a/synapse/storage/stream.py +++ b/synapse/storage/stream.py @@ -283,7 +283,7 @@ class StreamStore(SQLBaseStore): sql = ( "SELECT *, (%(redacted)s) AS redacted FROM events " - "WHERE room_id = ? AND stream_ordering <= ? " + "WHERE room_id = ? AND stream_ordering <= ? AND outlier = 0 " "ORDER BY topological_ordering DESC, stream_ordering DESC LIMIT ? " ) % { "redacted": del_sql, |