Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixes

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)
 =======================================
 

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"

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