summary refs log tree commit diff
path: root/synapse/app/homeserver.py
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2015-10-13 13:57:06 +0100
committerErik Johnston <erik@matrix.org>2015-10-13 14:03:30 +0100
commit88971fd03451205a74babc594b1730bf6d80faf1 (patch)
treede90f47ba080d217dbc62c238be5b9ba1123e242 /synapse/app/homeserver.py
parentAdd SQLite support (diff)
parentrename schema_prepare to prepare_database (diff)
downloadsynapse-88971fd03451205a74babc594b1730bf6d80faf1.tar.xz
Merge branch 'erikj/store_engine' into erikj/search
Diffstat (limited to 'synapse/app/homeserver.py')
-rwxr-xr-xsynapse/app/homeserver.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/app/homeserver.py b/synapse/app/homeserver.py
index b284d07cf0..af53acb369 100755
--- a/synapse/app/homeserver.py
+++ b/synapse/app/homeserver.py
@@ -36,7 +36,7 @@ if __name__ == '__main__':
 
 from synapse.storage.engines import create_engine, IncorrectDatabaseSetup
 from synapse.storage import are_all_users_on_domain
-from synapse.storage.schema_prepare import UpgradeDatabaseException
+from synapse.storage.prepare_database import UpgradeDatabaseException
 
 from synapse.server import HomeServer