summary refs log tree commit diff
path: root/synapse/federation/replication.py
diff options
context:
space:
mode:
authorMark Haines <mark.haines@matrix.org>2014-10-15 13:57:12 +0100
committerMark Haines <mark.haines@matrix.org>2014-10-15 13:57:12 +0100
commit27d0c1ecc21026e9fb231746114b53b83ed0b594 (patch)
treee32b0781ff4ff7d46b3cf25f2f2715aa9248cc16 /synapse/federation/replication.py
parentStorage for pdu signatures (diff)
parentSYN-103: Ignore the 'origin' key in received EDUs. Instead take the origin fr... (diff)
downloadsynapse-27d0c1ecc21026e9fb231746114b53b83ed0b594.tar.xz
Merge branch 'develop' into event_signing
Diffstat (limited to 'synapse/federation/replication.py')
-rw-r--r--synapse/federation/replication.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/federation/replication.py b/synapse/federation/replication.py

index 2346d55045..9363ac7300 100644 --- a/synapse/federation/replication.py +++ b/synapse/federation/replication.py
@@ -319,7 +319,7 @@ class ReplicationLayer(object): if hasattr(transaction, "edus"): for edu in [Edu(**x) for x in transaction.edus]: - self.received_edu(edu.origin, edu.edu_type, edu.content) + self.received_edu(transaction.origin, edu.edu_type, edu.content) results = yield defer.DeferredList(dl)