summary refs log tree commit diff
path: root/synapse/state.py
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2015-01-30 15:16:38 +0000
committerErik Johnston <erik@matrix.org>2015-01-30 15:16:38 +0000
commit1bd540ef7943c08e350ba24c407f152016fa6064 (patch)
tree47f2f0cbc07a943fbdd8d154b6d88ace246e4787 /synapse/state.py
parentMerge branch 'replication_split' of github.com:matrix-org/synapse into reject... (diff)
parentMerge pull request #42 from matrix-org/replication_split (diff)
downloadsynapse-1bd540ef7943c08e350ba24c407f152016fa6064.tar.xz
Merge branch 'develop' of github.com:matrix-org/synapse into rejections
Conflicts:
	synapse/storage/schema/im.sql
Diffstat (limited to '')
-rw-r--r--synapse/state.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/synapse/state.py b/synapse/state.py
index bb439ed9d0..038e5eba11 100644
--- a/synapse/state.py
+++ b/synapse/state.py
@@ -312,7 +312,8 @@ class StateHandler(object):
             except AuthError:
                 pass
 
-        # Oh dear.
+        # Use the last event (the one with the least depth) if they all fail
+        # the auth check.
         return event
 
     def _ordered_events(self, events):