diff options
| author | David Baker <dave@matrix.org> | 2015-04-17 13:51:10 +0100 |
|---|---|---|
| committer | David Baker <dave@matrix.org> | 2015-04-17 13:51:10 +0100 |
| commit | cb03fafdf150cb97d494c1a12efb730e01309fb2 (patch) | |
| tree | 5c6994f2ec826599984d7a621caeb889aeef4c57 /synapse/storage/__init__.py | |
| parent | Register the 3pid servlet (diff) | |
| parent | Filter typing nofication events to only those rooms the requesting user is a ... (diff) | |
| download | synapse-cb03fafdf150cb97d494c1a12efb730e01309fb2.tar.xz | |
Merge branch 'develop' into csauth
Diffstat (limited to 'synapse/storage/__init__.py')
| -rw-r--r-- | synapse/storage/__init__.py | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/synapse/storage/__init__.py b/synapse/storage/__init__.py index c69d11261c..f4dec70393 100644 --- a/synapse/storage/__init__.py +++ b/synapse/storage/__init__.py @@ -14,9 +14,10 @@ # limitations under the License. from twisted.internet import defer - +from .appservice import ( + ApplicationServiceStore, ApplicationServiceTransactionStore +) from ._base import Cache -from .appservice import ApplicationServiceStore from .directory import DirectoryStore from .events import EventsStore from .presence import PresenceStore @@ -50,7 +51,7 @@ logger = logging.getLogger(__name__) # Remember to update this number every time a change is made to database # schema files, so the users will be informed on server restarts. -SCHEMA_VERSION = 14 +SCHEMA_VERSION = 15 dir_path = os.path.abspath(os.path.dirname(__file__)) @@ -71,6 +72,7 @@ class DataStore(RoomMemberStore, RoomStore, FilteringStore, PusherStore, PushRuleStore, + ApplicationServiceTransactionStore, EventsStore, ): |