summary refs log tree commit diff
path: root/synapse/storage
diff options
context:
space:
mode:
authorMatthew Hodgson <matthew@matrix.org>2017-01-05 13:39:43 +0000
committerMatthew Hodgson <matthew@matrix.org>2017-01-05 13:39:43 +0000
commit8cfc0165e913a140782538003fd61c2e01dcf81d (patch)
tree6a4be99f41ac2bb567fabadf97094a82d7444c16 /synapse/storage
parentMerge pull request #1766 from matrix-org/markjh/linear_logging (diff)
downloadsynapse-8cfc0165e913a140782538003fd61c2e01dcf81d.tar.xz
fix annoying typos
Diffstat (limited to '')
-rw-r--r--synapse/storage/roommember.py4
-rw-r--r--synapse/storage/state.py2
2 files changed, 3 insertions, 3 deletions
diff --git a/synapse/storage/roommember.py b/synapse/storage/roommember.py
index 946d5a81cc..5d18037c7c 100644
--- a/synapse/storage/roommember.py
+++ b/synapse/storage/roommember.py
@@ -393,8 +393,8 @@ class RoomMemberStore(SQLBaseStore):
     @cachedInlineCallbacks(num_args=2, cache_context=True)
     def _get_joined_users_from_context(self, room_id, state_group, current_state_ids,
                                        cache_context, event=None):
-        # We don't use `state_group`, its there so that we can cache based
-        # on it. However, its important that its never None, since two current_state's
+        # We don't use `state_group`, it's there so that we can cache based
+        # on it. However, it's important that it's never None, since two current_states
         # with a state_group of None are likely to be different.
         # See bulk_get_push_rules_for_room for how we work around this.
         assert state_group is not None
diff --git a/synapse/storage/state.py b/synapse/storage/state.py
index 23e7ad9922..7f466c40ac 100644
--- a/synapse/storage/state.py
+++ b/synapse/storage/state.py
@@ -384,7 +384,7 @@ class StateStore(SQLBaseStore):
                     # We did this before by getting the list of group ids, and
                     # then passing that list to sqlite to get latest event for
                     # each (type, state_key). However, that was terribly slow
-                    # without the right indicies (which we can't add until
+                    # without the right indices (which we can't add until
                     # after we finish deduping state, which requires this func)
                     args = [next_group]
                     if types: