diff options
| author | Mark Haines <mark.haines@matrix.org> | 2015-09-07 15:06:46 +0100 |
|---|---|---|
| committer | Mark Haines <mark.haines@matrix.org> | 2015-09-07 15:06:46 +0100 |
| commit | 73e4ad4b8b24bb99a8ede4bda8ac2263b68cad5e (patch) | |
| tree | 268463223a4dbed35244b83ffb7b767330f8416e /synapse | |
| parent | update logger to match new ambiguous script name... (diff) | |
| parent | DEPENDENCY_LINKS was turned to a list (diff) | |
| download | synapse-73e4ad4b8b24bb99a8ede4bda8ac2263b68cad5e.tar.xz | |
Merge branch 'master' into develop
Conflicts: setup.py
Diffstat (limited to 'synapse')
| -rw-r--r-- | synapse/__init__.py | 2 | ||||
| -rwxr-xr-x | synapse/app/homeserver.py | 2 | ||||
| -rw-r--r-- | synapse/config/_base.py | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/synapse/__init__.py b/synapse/__init__.py index 57b8304d35..d85bb3dce0 100644 --- a/synapse/__init__.py +++ b/synapse/__init__.py @@ -16,4 +16,4 @@ """ This is a reference implementation of a Matrix home server. """ -__version__ = "0.10.0-rc5" +__version__ = "0.10.0" diff --git a/synapse/app/homeserver.py b/synapse/app/homeserver.py index ffc6299146..c23f853230 100755 --- a/synapse/app/homeserver.py +++ b/synapse/app/homeserver.py @@ -341,7 +341,7 @@ def get_version_string(): ) ).encode("ascii") except Exception as e: - logger.warn("Failed to check for git repository: %s", e) + logger.info("Failed to check for git repository: %s", e) return ("Synapse/%s" % (synapse.__version__,)).encode("ascii") diff --git a/synapse/config/_base.py b/synapse/config/_base.py index 1a6784a714..8a75c48733 100644 --- a/synapse/config/_base.py +++ b/synapse/config/_base.py @@ -182,7 +182,7 @@ class Config(object): ) % (entry_path, ) continue - files.add(config_path) + files.append(entry_path) config_files.extend(sorted(files)) else: |