summary refs log tree commit diff
path: root/changelog.d/7002.misc
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2020-02-27 16:33:21 +0000
committerGitHub <noreply@github.com>2020-02-27 16:33:21 +0000
commit2201bc979588720bd99880b9cd8df2292b2d483f (patch)
tree090e67e0037c68c27b54d9c5a3a3e7c7d4995445 /changelog.d/7002.misc
parentset worker_app for frontend proxy test (#7003) (diff)
downloadsynapse-2201bc979588720bd99880b9cd8df2292b2d483f.tar.xz
Don't refuse to start worker if media listener configured. (#7002)
Instead lets just warn if the worker has a media listener configured but
has the media repository disabled.

Previously non media repository workers would just ignore the media
listener.
Diffstat (limited to 'changelog.d/7002.misc')
-rw-r--r--changelog.d/7002.misc1
1 files changed, 1 insertions, 0 deletions
diff --git a/changelog.d/7002.misc b/changelog.d/7002.misc
new file mode 100644
index 0000000000..ec5c004bbe
--- /dev/null
+++ b/changelog.d/7002.misc
@@ -0,0 +1 @@
+Merge worker apps together.