summary refs log tree commit diff
path: root/synapse
diff options
context:
space:
mode:
authorRichard van der Hoff <richard@matrix.org>2019-12-20 11:11:34 +0000
committerRichard van der Hoff <richard@matrix.org>2019-12-20 11:11:34 +0000
commit56ad230efac1f6e565305584c0961ff2fcc4564a (patch)
treec38ff4d4d7af48a428a46ecb55bd79b60c2c35e0 /synapse
parentSplit state groups into a separate data store (#6296) (diff)
parentMerge tag 'v1.7.2' (diff)
downloadsynapse-56ad230efac1f6e565305584c0961ff2fcc4564a.tar.xz
Merge branch 'master' into develop
Diffstat (limited to 'synapse')
-rw-r--r--synapse/__init__.py2
-rw-r--r--synapse/handlers/federation.py5
2 files changed, 5 insertions, 2 deletions
diff --git a/synapse/__init__.py b/synapse/__init__.py
index e951bab593..996101cf09 100644
--- a/synapse/__init__.py
+++ b/synapse/__init__.py
@@ -36,7 +36,7 @@ try:
 except ImportError:
     pass
 
-__version__ = "1.7.1"
+__version__ = "1.7.2"
 
 if bool(os.environ.get("SYNAPSE_TEST_PATCH_LOG_CONTEXTS", False)):
     # We import here so that we don't have to install a bunch of deps when
diff --git a/synapse/handlers/federation.py b/synapse/handlers/federation.py
index 05ae40dde7..72a0febc2b 100644
--- a/synapse/handlers/federation.py
+++ b/synapse/handlers/federation.py
@@ -792,7 +792,10 @@ class FederationHandler(BaseHandler):
         events_to_state = {}
         for e_id in edges:
             state, auth = await self._get_state_for_room(
-                destination=dest, room_id=room_id, event_id=e_id
+                destination=dest,
+                room_id=room_id,
+                event_id=e_id,
+                include_event_in_state=False,
             )
             auth_events.update({a.event_id: a for a in auth})
             auth_events.update({s.event_id: s for s in state})