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

Conflicts:
	synapse/app/homeserver.py
	synapse/state.py

1 files changed, 2 insertions, 1 deletions

diff --git a/synapse/app/homeserver.py b/synapse/app/homeserver.py

index 3a128af5f7..2b17cae54f 100755
--- a/synapse/app/homeserver.py
+++ b/synapse/app/homeserver.py
@@ -67,7 +67,7 @@ class SynapseHomeServer(HomeServer):
         return ClientV2AlphaRestResource(self)
 
     def build_resource_for_federation(self):
-        return JsonResource()
+        return JsonResource(self)
 
     def build_resource_for_web_client(self):
         syweb_path = os.path.dirname(syweb.__file__)
@@ -275,6 +275,7 @@ def setup():
     hs.get_pusherpool().start()
 
     hs.get_state_handler().start_caching()
+    hs.get_datastore().start_profiling()
 
     if config.daemonize:
         print config.pid_file