summary refs log tree commit diff
diff options
context:
space:
mode:
authorRichard van der Hoff <richard@matrix.org>2020-10-01 13:38:26 +0100
committerRichard van der Hoff <richard@matrix.org>2020-10-01 13:38:26 +0100
commit2eb947e0eee7d66a77fc4a7e7af5234cacece3e6 (patch)
tree7213e0ff1b40d714d7d019425c366601493b2bbd
parentfix a logging error in thumbnailer (#8435) (diff)
downloadsynapse-2eb947e0eee7d66a77fc4a7e7af5234cacece3e6.tar.xz
update changelog v1.21.0rc1
-rw-r--r--CHANGES.md2
-rw-r--r--changelog.d/8435.bugfix1
2 files changed, 1 insertions, 2 deletions
diff --git a/CHANGES.md b/CHANGES.md
index 267909d3e9..29711c60ce 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -27,7 +27,7 @@ Bugfixes
 - Fix inconsistent handling of non-existent push rules, and stop tracking the `enabled` state of removed push rules. ([\#7796](https://github.com/matrix-org/synapse/issues/7796))
 - Fix a longstanding bug when storing a media file with an empty `upload_name`. ([\#7905](https://github.com/matrix-org/synapse/issues/7905))
 - Fix messages not being sent over federation until an event is sent into the same room. ([\#8230](https://github.com/matrix-org/synapse/issues/8230), [\#8247](https://github.com/matrix-org/synapse/issues/8247), [\#8258](https://github.com/matrix-org/synapse/issues/8258), [\#8272](https://github.com/matrix-org/synapse/issues/8272), [\#8322](https://github.com/matrix-org/synapse/issues/8322))
-- Fix a longstanding bug where files that could not be thumbnailed would result in an Internal Server Error. ([\#8236](https://github.com/matrix-org/synapse/issues/8236))
+- Fix a longstanding bug where files that could not be thumbnailed would result in an Internal Server Error. ([\#8236](https://github.com/matrix-org/synapse/issues/8236), [\#8435](https://github.com/matrix-org/synapse/issues/8435))
 - Upgrade minimum version of `canonicaljson` to version 1.4.0, to fix an unicode encoding issue. ([\#8262](https://github.com/matrix-org/synapse/issues/8262))
 - Fix longstanding bug which could lead to incomplete database upgrades on SQLite. ([\#8265](https://github.com/matrix-org/synapse/issues/8265))
 - Fix stack overflow when stderr is redirected to the logging system, and the logging system encounters an error. ([\#8268](https://github.com/matrix-org/synapse/issues/8268))
diff --git a/changelog.d/8435.bugfix b/changelog.d/8435.bugfix
deleted file mode 100644
index 6f04871015..0000000000
--- a/changelog.d/8435.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fix a longstanding bug where files that could not be thumbnailed would result in an Internal Server Error.