diff options
author | Neil Johnson <neil@matrix.org> | 2018-08-15 17:20:38 +0100 |
---|---|---|
committer | Neil Johnson <neil@matrix.org> | 2018-08-15 17:20:38 +0100 |
commit | 8cfad2e68630115a5ac4c3572b2183635c3ff029 (patch) | |
tree | 0649489c05db884455483d804304afcaa0cef509 /synapse/storage/events.py | |
parent | Merge branch 'develop' of github.com:matrix-org/synapse into neilj/server_not... (diff) | |
parent | Merge pull request #3689 from matrix-org/neilj/fix_off_by_1+maus (diff) | |
download | synapse-8cfad2e68630115a5ac4c3572b2183635c3ff029.tar.xz |
Merge branch 'develop' of github.com:matrix-org/synapse into neilj/server_notices_on_blocking
Diffstat (limited to 'synapse/storage/events.py')
-rw-r--r-- | synapse/storage/events.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/storage/events.py b/synapse/storage/events.py index 135af54fa9..025a7fb6d9 100644 --- a/synapse/storage/events.py +++ b/synapse/storage/events.py @@ -1911,7 +1911,7 @@ class EventsStore(EventFederationStore, EventsWorkerStore, BackgroundUpdateStore max_depth = max(row[0] for row in rows) if max_depth <= token.topological: - # We need to ensure we don't delete all the events from the datanase + # We need to ensure we don't delete all the events from the database # otherwise we wouldn't be able to send any events (due to not # having any backwards extremeties) raise SynapseError( |