summary refs log tree commit diff
path: root/synapse/storage/monthly_active_users.py
diff options
context:
space:
mode:
authorNeil Johnson <neil@matrix.org>2018-08-08 13:45:21 +0100
committerNeil Johnson <neil@matrix.org>2018-08-08 13:45:21 +0100
commitbe59910b93252e83af348bcfd8781eed75fcb674 (patch)
tree3b9145795bff0076067070d7f1d4351cd7a622c3 /synapse/storage/monthly_active_users.py
parentAbility to whitelist specific threepids against monthly active user limiting (diff)
parentMerge pull request #3633 from matrix-org/neilj/mau_tracker (diff)
downloadsynapse-be59910b93252e83af348bcfd8781eed75fcb674.tar.xz
Merge branch 'develop' of github.com:matrix-org/synapse into neilj/reserved_users
Diffstat (limited to 'synapse/storage/monthly_active_users.py')
-rw-r--r--synapse/storage/monthly_active_users.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/storage/monthly_active_users.py b/synapse/storage/monthly_active_users.py
index 54de5a8686..d47dcef3a0 100644
--- a/synapse/storage/monthly_active_users.py
+++ b/synapse/storage/monthly_active_users.py
@@ -87,7 +87,7 @@ class MonthlyActiveUsersStore(SQLBaseStore):
             # If MAU user count still exceeds the MAU threshold, then delete on
             # a least recently active basis.
             # Note it is not possible to write this query using OFFSET due to
-            # incompatibilities in how sqlite an postgres support the feature.
+            # incompatibilities in how sqlite and postgres support the feature.
             # sqlite requires 'LIMIT -1 OFFSET ?', the LIMIT must be present
             # While Postgres does not require 'LIMIT', but also does not support
             # negative LIMIT values. So there is no way to write it that both can