summary refs log tree commit diff
path: root/synapse/federation
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2014-09-12 17:11:00 +0100
committerErik Johnston <erik@matrix.org>2014-09-12 17:11:09 +0100
commit39e3fc69e5a190371aa6936bfea57e9f8bd5255b (patch)
tree9039a84cc75dd1f0ac17c310907728c8815e8c96 /synapse/federation
parentFix bug where we incorrectly removed a remote host from the list of hosts in ... (diff)
downloadsynapse-39e3fc69e5a190371aa6936bfea57e9f8bd5255b.tar.xz
Make the state resolution use actual power levels rather than taking them from a Pdu key.
Diffstat (limited to 'synapse/federation')
-rw-r--r--synapse/federation/units.py1
1 files changed, 1 insertions, 0 deletions
diff --git a/synapse/federation/units.py b/synapse/federation/units.py
index 9740431279..622fe66a8f 100644
--- a/synapse/federation/units.py
+++ b/synapse/federation/units.py
@@ -69,6 +69,7 @@ class Pdu(JsonEncodedObject):
         "prev_state_id",
         "prev_state_origin",
         "required_power_level",
+        "user_id",
     ]
 
     internal_keys = [