Matrix-Mirrors/synapse-product
1
0
Fork 0
mirror of https://git.anonymousland.org/anonymousland/synapse-product.git synced 2025-09-29 06:29:30 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'develop' into pushers

Browse source
This commit is contained in:
David Baker 2015-01-13 13:15:51 +00:00
commit c06a9063e1
150 changed files with 1098 additions and 439 deletions
Download patch file Download diff file Expand all files Collapse all files

8
synapse/storage/__init__.py
View file

@ -1,5 +1,5 @@
# -*- coding: utf-8 -*-
# Copyright 2014 OpenMarket Ltd
# Copyright 2014, 2015 OpenMarket Ltd
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@ -68,7 +68,7 @@ SCHEMAS = [
# Remember to update this number every time an incompatible change is made to
# database schema files, so the users will be informed on server restarts.
SCHEMA_VERSION = 10
SCHEMA_VERSION = 11
class _RollbackButIsFineException(Exception):
@ -146,9 +146,7 @@ class DataStore(RoomMemberStore, RoomStore,
elif event.type == EventTypes.Redaction:
self._store_redaction(txn, event)
outlier = False
if hasattr(event.internal_metadata, "outlier"):
outlier = event.internal_metadata.outlier
outlier = event.internal_metadata.is_outlier()
event_dict = {
k: v