From 3aa2a90556075926f5dc8c46514bbd6b3d95acb1 Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Thu, 24 Oct 2019 16:45:00 +0100 Subject: [PATCH 1/2] Move schema delta files to the correct data store. They were put in the global schema delta directory due to a bad merge. --- .../{ => data_stores/main}/schema/delta/56/hidden_devices.sql | 0 .../{ => data_stores/main}/schema/delta/56/signing_keys.sql | 0 2 files changed, 0 insertions(+), 0 deletions(-) rename synapse/storage/{ => data_stores/main}/schema/delta/56/hidden_devices.sql (100%) rename synapse/storage/{ => data_stores/main}/schema/delta/56/signing_keys.sql (100%) diff --git a/synapse/storage/schema/delta/56/hidden_devices.sql b/synapse/storage/data_stores/main/schema/delta/56/hidden_devices.sql similarity index 100% rename from synapse/storage/schema/delta/56/hidden_devices.sql rename to synapse/storage/data_stores/main/schema/delta/56/hidden_devices.sql diff --git a/synapse/storage/schema/delta/56/signing_keys.sql b/synapse/storage/data_stores/main/schema/delta/56/signing_keys.sql similarity index 100% rename from synapse/storage/schema/delta/56/signing_keys.sql rename to synapse/storage/data_stores/main/schema/delta/56/signing_keys.sql From 19be9b703a2e9b71626e4d6c7ef2c34f74285921 Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Thu, 24 Oct 2019 16:46:39 +0100 Subject: [PATCH 2/2] Newsfile --- changelog.d/6248.misc | 1 + 1 file changed, 1 insertion(+) create mode 100644 changelog.d/6248.misc diff --git a/changelog.d/6248.misc b/changelog.d/6248.misc new file mode 100644 index 0000000000..97176bcfc7 --- /dev/null +++ b/changelog.d/6248.misc @@ -0,0 +1 @@ +Move schema delta files to the correct data store.