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

This commit is contained in:
Erik Johnston 2017-02-27 16:40:11 +00:00
commit 8a6196c6c8
5 changed files with 84 additions and 51 deletions

View file

@ -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",