summary refs log tree commit diff
path: root/synapse/util/caches/response_cache.py
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2019-06-28 10:04:54 +0100
committerErik Johnston <erik@matrix.org>2019-06-28 10:04:54 +0100
commit576b62a6a314ea3928f8717704bbd3aedbdd1f25 (patch)
treea9252a394dae4fc3839585a2abfeeee65593560a /synapse/util/caches/response_cache.py
parentMerge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixes (diff)
parentUpdate the TLS cipher string and provide configurability for TLS on outgoing ... (diff)
downloadsynapse-576b62a6a314ea3928f8717704bbd3aedbdd1f25.tar.xz
Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixes
Diffstat (limited to 'synapse/util/caches/response_cache.py')
-rw-r--r--synapse/util/caches/response_cache.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/util/caches/response_cache.py b/synapse/util/caches/response_cache.py

index b1da81633c..cbe54d45dd 100644 --- a/synapse/util/caches/response_cache.py +++ b/synapse/util/caches/response_cache.py
@@ -137,7 +137,7 @@ class ResponseCache(object): *args: positional parameters to pass to the callback, if it is used - **kwargs: named paramters to pass to the callback, if it is used + **kwargs: named parameters to pass to the callback, if it is used Returns: twisted.internet.defer.Deferred: yieldable result