diff options
| author | Mark Haines <mark.haines@matrix.org> | 2015-01-06 19:48:53 +0000 |
|---|---|---|
| committer | Mark Haines <mark.haines@matrix.org> | 2015-01-06 19:48:53 +0000 |
| commit | 5cf45c43190321b3ee6df4198df815da29dac90f (patch) | |
| tree | 9841d49b0964de4046c0835ddcc976a25c2c8137 | |
| parent | Use time.time() instead of time.clock() (diff) | |
| parent | Merge branch 'hotfixes-v0.6.0a' (diff) | |
| download | synapse-5cf45c43190321b3ee6df4198df815da29dac90f.tar.xz | |
Merge branch 'master' into develop
| -rwxr-xr-x | synapse/app/homeserver.py | 2 | ||||
| -rw-r--r-- | synapse/media/v1/base_resource.py | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/synapse/app/homeserver.py b/synapse/app/homeserver.py index f8484f1a3b..5fec8da7ca 100755 --- a/synapse/app/homeserver.py +++ b/synapse/app/homeserver.py @@ -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) diff --git a/synapse/media/v1/base_resource.py b/synapse/media/v1/base_resource.py index d2e5c947d1..688e7376ad 100644 --- a/synapse/media/v1/base_resource.py +++ b/synapse/media/v1/base_resource.py @@ -139,6 +139,7 @@ class BaseMediaResource(Resource): @download.addBoth def callback(media_info): del self.downloads[key] + return media_info return download @defer.inlineCallbacks |