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

This commit is contained in:
Erik Johnston 2015-01-07 09:40:42 +00:00
commit 1497e50649
2 changed files with 2 additions and 1 deletions

View File

@ -234,7 +234,7 @@ def setup():
except UpgradeDatabaseException:
sys.stderr.write(
"\nFailed to upgrade database.\n"
"Have you followed any instructions in UPGRADES.rst?\n"
"Have you checked for version specific instructions in UPGRADES.rst?\n"
)
sys.exit(1)

View File

@ -139,6 +139,7 @@ class BaseMediaResource(Resource):
@download.addBoth
def callback(media_info):
del self.downloads[key]
return media_info
return download
@defer.inlineCallbacks