Merge commit 'a7bdf98d0' into anoa/dinsic_release_1_21_x

* commit 'a7bdf98d0':
  Rename database classes to make some sense (#8033)

1 files changed, 4 insertions, 1 deletions

diff --git a/synapse/config/database.py b/synapse/config/database.py

index 62bccd9ef5..8a18a9ca2a 100644
--- a/synapse/config/database.py
+++ b/synapse/config/database.py
@@ -100,7 +100,10 @@ class DatabaseConnectionConfig:
 
         self.name = name
         self.config = db_config
-        self.data_stores = data_stores
+
+        # The `data_stores` config is actually talking about `databases` (we
+        # changed the name).
+        self.databases = data_stores
 
 
 class DatabaseConfig(Config):