From 76ed3476d3f59bc17c345aa8dffbc2635999e5fa Mon Sep 17 00:00:00 2001
From: Erik Johnston <erik@matrix.org>
Date: Thu, 6 Jul 2017 18:11:22 +0100
Subject: [PATCH 1/2] Bump version and changelog

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

diff --git a/CHANGES.rst b/CHANGES.rst
index e7c12dd919..a415944756 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,3 +1,12 @@
+Changes in synapse v0.22.1 (2017-07-06)
+=======================================
+
+Bug fixes:
+
+* Fix bug where pusher pool didn't start and caused issues when
+  interacting with some rooms (PR #2342)
+
+
 Changes in synapse v0.22.0 (2017-07-06)
 =======================================
 
diff --git a/synapse/__init__.py b/synapse/__init__.py
index 60af1cbecd..dbf22eca00 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.22.0"
+__version__ = "0.22.1"

From d4d12daed9374ef0419528b877ca37ff1821367a Mon Sep 17 00:00:00 2001
From: Erik Johnston <erik@matrix.org>
Date: Fri, 7 Jul 2017 18:36:45 +0100
Subject: [PATCH 2/2] Include registration and as stores in frontend proxy

---
 synapse/app/frontend_proxy.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/synapse/app/frontend_proxy.py b/synapse/app/frontend_proxy.py
index c8fa7854ad..132f18a979 100644
--- a/synapse/app/frontend_proxy.py
+++ b/synapse/app/frontend_proxy.py
@@ -25,6 +25,8 @@ from synapse.metrics.resource import MetricsResource, METRICS_PREFIX
 from synapse.replication.slave.storage._base import BaseSlavedStore
 from synapse.replication.slave.storage.client_ips import SlavedClientIpStore
 from synapse.replication.slave.storage.devices import SlavedDeviceStore
+from synapse.replication.slave.storage.registration import SlavedRegistrationStore
+from synapse.replication.slave.storage.appservice import SlavedApplicationServiceStore
 from synapse.replication.tcp.client import ReplicationClientHandler
 from synapse.server import HomeServer
 from synapse.storage.engines import create_engine
@@ -111,6 +113,8 @@ class KeyUploadServlet(RestServlet):
 class FrontendProxySlavedStore(
     SlavedDeviceStore,
     SlavedClientIpStore,
+    SlavedApplicationServiceStore,
+    SlavedRegistrationStore,
     BaseSlavedStore,
 ):
     pass