Merge branch 'develop' of github.com:matrix-org/synapse into erikj/refactor_stores

6 files changed, 9 insertions, 0 deletions

diff --git a/changelog.d/5759.misc b/changelog.d/5759.misc
new file mode 100644

index 0000000000..dc7e2c01bf
--- /dev/null
+++ b/changelog.d/5759.misc
@@ -0,0 +1,4 @@
+Allow devices to be marked as hidden, for use by features such as cross-signing.
+This adds a new field with a default value to the devices field in the database,
+and so the database upgrade may take a long time depending on how many devices
+are in the database.
diff --git a/changelog.d/5769.feature b/changelog.d/5769.feature
new file mode 100644

index 0000000000..bf994ca327
--- /dev/null
+++ b/changelog.d/5769.feature
@@ -0,0 +1 @@
+Allow uploading of cross-signing keys.
\ No newline at end of file
diff --git a/changelog.d/6197.docker b/changelog.d/6197.docker
new file mode 100644

index 0000000000..71fb9cbff5
--- /dev/null
+++ b/changelog.d/6197.docker
@@ -0,0 +1 @@
+Fix logging getting lost for the docker image.
diff --git a/changelog.d/6214.misc b/changelog.d/6214.misc
new file mode 100644

index 0000000000..c3fd04d0d8
--- /dev/null
+++ b/changelog.d/6214.misc
@@ -0,0 +1 @@
+Remove some unused event-auth code.
diff --git a/changelog.d/6217.misc b/changelog.d/6217.misc
new file mode 100644

index 0000000000..503352ee0b
--- /dev/null
+++ b/changelog.d/6217.misc
@@ -0,0 +1 @@
+Remove Auth.check method.
diff --git a/changelog.d/6219.misc b/changelog.d/6219.misc
new file mode 100644

index 0000000000..296406246d
--- /dev/null
+++ b/changelog.d/6219.misc
@@ -0,0 +1 @@
+Remove `format_tap.py` script in favour of a perl reimplementation in Sytest's repo.
\ No newline at end of file