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

This commit is contained in:
Erik Johnston 2015-03-20 16:31:48 +00:00
commit f6583796fe
37 changed files with 542 additions and 145 deletions

View file

@ -52,6 +52,7 @@ class EventsStore(SQLBaseStore):
is_new_state=is_new_state,
current_state=current_state,
)
self.get_room_events_max_id.invalidate()
except _RollbackButIsFineException:
pass
@ -242,7 +243,6 @@ class EventsStore(SQLBaseStore):
if stream_ordering is None:
stream_ordering = self.get_next_stream_id()
unrec = {
k: v
for k, v in event.get_dict().items()