summary refs log tree commit diff
path: root/contrib/cmdclient/console.py
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2019-09-06 12:50:28 +0100
committerErik Johnston <erik@matrix.org>2019-09-06 12:50:28 +0100
commit39883e85bd2ada6fcf2b56be5bf395649f83c09f (patch)
treee55aed646a9347e01f581adde9c8e74f0b22ade7 /contrib/cmdclient/console.py
parentMerge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixes (diff)
parentMerge pull request #5991 from matrix-org/erikj/fix_tracing_funcs (diff)
downloadsynapse-39883e85bd2ada6fcf2b56be5bf395649f83c09f.tar.xz
Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixes
Diffstat (limited to 'contrib/cmdclient/console.py')
-rwxr-xr-xcontrib/cmdclient/console.py2
1 files changed, 2 insertions, 0 deletions
diff --git a/contrib/cmdclient/console.py b/contrib/cmdclient/console.py

index 899c650b0c..48da410d94 100755 --- a/contrib/cmdclient/console.py +++ b/contrib/cmdclient/console.py
@@ -37,6 +37,8 @@ from signedjson.sign import verify_signed_json, SignatureVerifyException CONFIG_JSON = "cmdclient_config.json" +# TODO: The concept of trusted identity servers has been deprecated. This option and checks +# should be removed TRUSTED_ID_SERVERS = ["localhost:8001"]