Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixes 2017-02-27

1 files changed, 0 insertions, 3 deletions

diff --git a/synapse/storage/event_push_actions.py b/synapse/storage/event_push_actions.py

index fe88eb045d..d138aaf540 100644
--- a/synapse/storage/event_push_actions.py
+++ b/synapse/storage/event_push_actions.py
@@ -640,9 +640,6 @@ class EventPushActionsStore(SQLBaseStore):
         the archiving process has caught up or not.
         """
 
-        # We want to make sure that we only ever do this one at a time
-        # self.database_engine.lock_table(txn, "event_push_summary")
-
         old_rotate_stream_ordering = self._simple_select_one_onecol_txn(
             txn,
             table="event_push_summary_stream_ordering",