Merge branch 'develop' into pushers

This commit is contained in:
David Baker 2014-11-20 18:17:46 +00:00
commit 23465a30b6
35 changed files with 191 additions and 138 deletions

View file

@ -510,7 +510,7 @@ def prepare_database(db_conn):
"new for the server to understand"
)
elif user_version < SCHEMA_VERSION:
logging.info(
logger.info(
"Upgrading database from version %d",
user_version
)