summary refs log tree commit diff
diff options
context:
space:
mode:
authorPatrick Cloke <clokep@users.noreply.github.com>2021-11-08 09:36:49 -0500
committerGitHub <noreply@github.com>2021-11-08 14:36:49 +0000
commit0c82d4aabee5dc1751d261b8b99623383f29a61d (patch)
treeb4180e17ea5da6ba0cf515c9bd2dac90b56ff3a9
parentDefault value for `public_baseurl` (#11210) (diff)
downloadsynapse-0c82d4aabee5dc1751d261b8b99623383f29a61d.tar.xz
Fix typo in comment from #11255. (#11276)
-rw-r--r--changelog.d/11276.bugfix1
-rw-r--r--synapse/storage/prepare_database.py2
2 files changed, 2 insertions, 1 deletions
diff --git a/changelog.d/11276.bugfix b/changelog.d/11276.bugfix
new file mode 100644
index 0000000000..ce72592624
--- /dev/null
+++ b/changelog.d/11276.bugfix
@@ -0,0 +1 @@
+Fix rolling back Synapse version when using workers.
diff --git a/synapse/storage/prepare_database.py b/synapse/storage/prepare_database.py
index b5c1c14ee3..8b9c6adae2 100644
--- a/synapse/storage/prepare_database.py
+++ b/synapse/storage/prepare_database.py
@@ -142,7 +142,7 @@ def prepare_database(
                     databases=databases,
                 )
             elif version_info.current_version < SCHEMA_VERSION:
-                # If the DB is on an older version than we expect the we refuse
+                # If the DB is on an older version than we expect then we refuse
                 # to start the worker (as the main process needs to run first to
                 # update the schema).
                 raise UpgradeDatabaseException(