diff options
author | Erik Johnston <erik@matrix.org> | 2016-09-09 11:12:31 +0100 |
---|---|---|
committer | Erik Johnston <erik@matrix.org> | 2016-09-09 11:12:31 +0100 |
commit | 9bba6ebaa903a81cd94fada114aa71e20b685adb (patch) | |
tree | 4a8cc3cf739ea2be7b5dd126a6076e7b0f31336b /synapse | |
parent | Merge branch 'release-v0.17.2' of github.com:matrix-org/synapse (diff) | |
parent | Bump changelog and version (diff) | |
download | synapse-9bba6ebaa903a81cd94fada114aa71e20b685adb.tar.xz |
Merge branch 'release-v0.17.3' of github.com:matrix-org/synapse v0.17.3
Diffstat (limited to 'synapse')
-rw-r--r-- | synapse/__init__.py | 2 | ||||
-rw-r--r-- | synapse/storage/roommember.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/synapse/__init__.py b/synapse/__init__.py index 523deaa5ff..b778cd65c9 100644 --- a/synapse/__init__.py +++ b/synapse/__init__.py @@ -16,4 +16,4 @@ """ This is a reference implementation of a Matrix home server. """ -__version__ = "0.17.2" +__version__ = "0.17.3" diff --git a/synapse/storage/roommember.py b/synapse/storage/roommember.py index 6ab10db328..866d64e679 100644 --- a/synapse/storage/roommember.py +++ b/synapse/storage/roommember.py @@ -402,7 +402,7 @@ class RoomMemberStore(SQLBaseStore): keyvalues={ "membership": Membership.JOIN, }, - batch_size=1000, + batch_size=500, desc="_get_joined_users_from_context", ) |