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

This commit is contained in:
Erik Johnston 2014-09-01 19:57:28 +01:00
commit f452899fe2
17 changed files with 655 additions and 248 deletions

View file

@ -37,6 +37,7 @@ from .roommember import RoomMemberStore
from .stream import StreamStore
from .pdu import StatePduStore, PduStore
from .transactions import TransactionStore
from .keys import KeyStore
import json
import logging
@ -49,7 +50,7 @@ logger = logging.getLogger(__name__)
class DataStore(RoomMemberStore, RoomStore,
RegistrationStore, StreamStore, ProfileStore, FeedbackStore,
PresenceStore, PduStore, StatePduStore, TransactionStore,
DirectoryStore):
DirectoryStore, KeyStore):
def __init__(self, hs):
super(DataStore, self).__init__(hs)