diff options
| author | Andrew Morgan <andrew@amorgan.xyz> | 2021-11-15 11:52:32 +0000 |
|---|---|---|
| committer | Andrew Morgan <andrew@amorgan.xyz> | 2021-11-15 11:52:32 +0000 |
| commit | 2a93005a7b8b099f7f3b98637075dda55be63022 (patch) | |
| tree | e3f0caf862ba2ca673ee9bf2b36719204012a43a /synapse | |
| parent | Merge branch 'release-v1.47' into matrix-org-hotfixes (diff) | |
| parent | Move sql file for `remove_deleted_devices_from_device_inbox` into v65 (#11303) (diff) | |
| download | synapse-2a93005a7b8b099f7f3b98637075dda55be63022.tar.xz | |
Merge branch 'release-v1.47' into matrix-org-hotfixes
Diffstat (limited to 'synapse')
| -rw-r--r-- | synapse/__init__.py | 2 | ||||
| -rw-r--r-- | synapse/storage/schema/main/delta/65/05remove_deleted_devices_from_device_inbox.sql (renamed from synapse/storage/schema/main/delta/64/02remove_deleted_devices_from_device_inbox.sql) | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/synapse/__init__.py b/synapse/__init__.py index 5ef34bce40..06b179a7e8 100644 --- a/synapse/__init__.py +++ b/synapse/__init__.py @@ -47,7 +47,7 @@ try: except ImportError: pass -__version__ = "1.46.0" +__version__ = "1.47.0rc2" if bool(os.environ.get("SYNAPSE_TEST_PATCH_LOG_CONTEXTS", False)): # We import here so that we don't have to install a bunch of deps when diff --git a/synapse/storage/schema/main/delta/64/02remove_deleted_devices_from_device_inbox.sql b/synapse/storage/schema/main/delta/65/05remove_deleted_devices_from_device_inbox.sql index fca7290741..076179123d 100644 --- a/synapse/storage/schema/main/delta/64/02remove_deleted_devices_from_device_inbox.sql +++ b/synapse/storage/schema/main/delta/65/05remove_deleted_devices_from_device_inbox.sql @@ -19,4 +19,4 @@ -- This runs as background task, but may take a bit to finish. INSERT INTO background_updates (ordering, update_name, progress_json) VALUES - (6402, 'remove_deleted_devices_from_device_inbox', '{}'); + (6505, 'remove_deleted_devices_from_device_inbox', '{}'); |