summary refs log tree commit diff
path: root/synapse
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2015-01-30 15:56:32 +0000
committerErik Johnston <erik@matrix.org>2015-01-30 15:56:32 +0000
commit7a1e881665ab72e29ff931f88ee2b65e8e690f74 (patch)
treec7549dcfd6657a494b9bd0fb49e3ce08a1c86949 /synapse
parentMerge branch 'develop' of github.com:matrix-org/synapse into rejections (diff)
downloadsynapse-7a1e881665ab72e29ff931f88ee2b65e8e690f74.tar.xz
Remove debug logging
Diffstat (limited to '')
-rw-r--r--synapse/state.py9
1 files changed, 0 insertions, 9 deletions
diff --git a/synapse/state.py b/synapse/state.py
index 038e5eba11..8a056ee955 100644
--- a/synapse/state.py
+++ b/synapse/state.py
@@ -214,15 +214,6 @@ class StateHandler(object):
             if len(v.values()) > 1
         }
 
-        logger.debug(
-            "resolve_state_groups Unconflicted state: %s",
-            unconflicted_state.values(),
-        )
-        logger.debug(
-            "resolve_state_groups Conflicted state: %s",
-            conflicted_state.values(),
-        )
-
         if event_type:
             prev_states_events = conflicted_state.get(
                 (event_type, state_key), []