From 2ffec928e2512a72d73d5b4a715c4540d68011a6 Mon Sep 17 00:00:00 2001
From: Erik Johnston <erik@matrix.org>
Date: Fri, 9 Sep 2016 11:03:31 +0100
Subject: [PATCH 1/2] Reduce batch size to be under SQL limit

---
 synapse/storage/roommember.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/synapse/storage/roommember.py b/synapse/storage/roommember.py
index 6ab10db32..866d64e67 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",
         )
 

From 66efcbbff1c9f85a9bc003513af45ea513264abb Mon Sep 17 00:00:00 2001
From: Erik Johnston <erik@matrix.org>
Date: Fri, 9 Sep 2016 11:07:39 +0100
Subject: [PATCH 2/2] Bump changelog and version

---
 CHANGES.rst         | 9 ++++++++-
 synapse/__init__.py | 2 +-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/CHANGES.rst b/CHANGES.rst
index c40a32abd..23be6c8ef 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,10 +1,17 @@
+Changes in synapse v0.17.3 (2016-09-09)
+=======================================
+
+This release fixes a major bug that stopped servers from handling rooms with
+over 1000 members.
+
+
 Changes in synapse v0.17.2 (2016-09-08)
 =======================================
 
 This release contains security bug fixes. Please upgrade.
 
 
-No changes since v0.17.2
+No changes since v0.17.2-rc1
 
 
 Changes in synapse v0.17.2-rc1 (2016-09-05)
diff --git a/synapse/__init__.py b/synapse/__init__.py
index 523deaa5f..b778cd65c 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"