diff options
| author | Erik Johnston <erik@matrix.org> | 2016-09-09 11:15:40 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2016-09-09 11:15:40 +0100 |
| commit | 1fe7ca1362a0df3ebec55c6d32106f1c2938d71b (patch) | |
| tree | 61a85ae4cc2d86829f9e506d670701154796f8cf /synapse | |
| parent | Update last_device_stream_id_by_dest if there is nothing to send (diff) | |
| parent | Bump changelog and version (diff) | |
| download | synapse-1fe7ca1362a0df3ebec55c6d32106f1c2938d71b.tar.xz | |
Merge branch 'release-v0.17.3' of github.com:matrix-org/synapse into develop
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", ) |