diff options
| author | Matthew Hodgson <matthew@matrix.org> | 2017-01-05 13:58:19 +0000 |
|---|---|---|
| committer | Matthew Hodgson <matthew@matrix.org> | 2017-01-05 13:58:19 +0000 |
| commit | bd85434cb398a8272a1276574db4d28dc76f7f3f (patch) | |
| tree | bbecac7c1e86ba5a863f1a36fb7f9d9a1a9c6d7d /synapse/storage | |
| parent | Merge branch 'release-v0.18.6' into develop (diff) | |
| parent | Fix flake8 and update changelog (diff) | |
| download | synapse-bd85434cb398a8272a1276574db4d28dc76f7f3f.tar.xz | |
Merge branch 'release-v0.18.6' into develop
Diffstat (limited to 'synapse/storage')
| -rw-r--r-- | synapse/storage/roommember.py | 4 | ||||
| -rw-r--r-- | synapse/storage/state.py | 2 |
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: |