summary refs log tree commit diff
path: root/synapse/storage/database.py
diff options
context:
space:
mode:
authorBrendan Abolivier <babolivier@matrix.org>2021-07-06 14:11:37 +0100
committerBrendan Abolivier <babolivier@matrix.org>2021-07-06 14:11:37 +0100
commitfc8a586ab94a0ee704efbe865e3b2b4a6ea62d9a (patch)
treec6c5ce36652c0d08b346f5a7a9896ff36330902e /synapse/storage/database.py
parentMerge remote-tracking branch 'origin/develop' into matrix-org-hotfixes (diff)
parentSmall changelog tweaks (diff)
downloadsynapse-fc8a586ab94a0ee704efbe865e3b2b4a6ea62d9a.tar.xz
Merge branch 'release-v1.38' into matrix-org-hotfixes
Diffstat (limited to 'synapse/storage/database.py')
-rw-r--r--synapse/storage/database.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/storage/database.py b/synapse/storage/database.py

index d470cdacde..33c42cf95a 100644 --- a/synapse/storage/database.py +++ b/synapse/storage/database.py
@@ -111,7 +111,7 @@ def make_conn( db_config: DatabaseConnectionConfig, engine: BaseDatabaseEngine, default_txn_name: str, -) -> Connection: +) -> "LoggingDatabaseConnection": """Make a new connection to the database and return it. Returns: