summary refs log tree commit diff
diff options
context:
space:
mode:
authorAndrew Morgan <andrew@amorgan.xyz>2020-03-16 15:30:28 +0000
committerAndrew Morgan <andrew@amorgan.xyz>2020-03-16 15:30:28 +0000
commit91aede120cdf1a6d8384ce1fae8512d522df713a (patch)
tree3443b621b1e8fe43a9132a6a1e9856eb35288440
parentMerge pull request #6247 from matrix-org/babolivier/port_db_column (diff)
parentMerge pull request #6248 from matrix-org/erikj/move_schema_files (diff)
downloadsynapse-91aede120cdf1a6d8384ce1fae8512d522df713a.tar.xz
Merge pull request #6248 from matrix-org/erikj/move_schema_files
* commit 'e39bc62b8':
  Newsfile
  Move schema delta files to the correct data store.
-rw-r--r--changelog.d/6248.misc1
-rw-r--r--synapse/storage/data_stores/main/schema/delta/56/hidden_devices.sql (renamed from synapse/storage/schema/delta/56/hidden_devices.sql)0
-rw-r--r--synapse/storage/data_stores/main/schema/delta/56/signing_keys.sql (renamed from synapse/storage/schema/delta/56/signing_keys.sql)0
3 files changed, 1 insertions, 0 deletions
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. diff --git a/synapse/storage/schema/delta/56/hidden_devices.sql b/synapse/storage/data_stores/main/schema/delta/56/hidden_devices.sql
index 67f8b20297..67f8b20297 100644 --- a/synapse/storage/schema/delta/56/hidden_devices.sql +++ b/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
index 27a96123e3..27a96123e3 100644 --- a/synapse/storage/schema/delta/56/signing_keys.sql +++ b/synapse/storage/data_stores/main/schema/delta/56/signing_keys.sql