summary refs log tree commit diff
path: root/synapse/app/homeserver.py
diff options
context:
space:
mode:
authorMark Haines <mark.haines@matrix.org>2015-09-07 15:06:46 +0100
committerMark Haines <mark.haines@matrix.org>2015-09-07 15:06:46 +0100
commit73e4ad4b8b24bb99a8ede4bda8ac2263b68cad5e (patch)
tree268463223a4dbed35244b83ffb7b767330f8416e /synapse/app/homeserver.py
parentupdate logger to match new ambiguous script name... (diff)
parentDEPENDENCY_LINKS was turned to a list (diff)
downloadsynapse-73e4ad4b8b24bb99a8ede4bda8ac2263b68cad5e.tar.xz
Merge branch 'master' into develop
Conflicts:
	setup.py
Diffstat (limited to 'synapse/app/homeserver.py')
-rwxr-xr-xsynapse/app/homeserver.py2
1 files changed, 1 insertions, 1 deletions
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")