OpenCloud
/
MatrixSynapse
mirror of https://github.com/matrix-org/synapse
1
0
Fork 0
Code Issues Releases Wiki Activity

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

pull/105/head
Erik Johnston 2015-01-07 09:40:42 +00:00
parent dfa05f0cd6 5cf45c4319
commit 1497e50649
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
synapse/app/homeserver.py
View File

@ -234,7 +234,7 @@ def setup():
except UpgradeDatabaseException: except UpgradeDatabaseException:
sys.stderr.write( sys.stderr.write(
"\nFailed to upgrade database.\n" "\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) sys.exit(1)

1
synapse/media/v1/base_resource.py
View File

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