summary refs log tree commit diff
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2020-01-09 17:14:02 +0000
committerErik Johnston <erik@matrix.org>2020-01-09 17:14:02 +0000
commit645b1f0ea1f5f1ece0e039ab1140771689fbb8a4 (patch)
tree2b9311b5fff0c9a3c41f898117d26bf85d48c8f9
parentAllow admin users to create or modify users without a shared secret (#6495) (diff)
parentAdd note about log_file no longer be accepted (#6674) (diff)
downloadsynapse-645b1f0ea1f5f1ece0e039ab1140771689fbb8a4.tar.xz
Merge branch 'master' of github.com:matrix-org/synapse into develop
-rw-r--r--CHANGES.md3
-rw-r--r--UPGRADE.rst9
2 files changed, 12 insertions, 0 deletions
diff --git a/CHANGES.md b/CHANGES.md
index bdc03e67d6..c8840e9c74 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,6 +1,9 @@
 Synapse 1.8.0 (2020-01-09)
 ==========================
 
+**WARNING**: As of this release Synapse will refuse to start if the `log_file` config option is specified. Support for the option was removed in v1.3.0.
+
+
 Bugfixes
 --------
 
diff --git a/UPGRADE.rst b/UPGRADE.rst
index d9020f2663..a0202932b1 100644
--- a/UPGRADE.rst
+++ b/UPGRADE.rst
@@ -75,6 +75,15 @@ for example:
      wget https://packages.matrix.org/debian/pool/main/m/matrix-synapse-py3/matrix-synapse-py3_1.3.0+stretch1_amd64.deb
      dpkg -i matrix-synapse-py3_1.3.0+stretch1_amd64.deb
 
+
+Upgrading to v1.8.0
+===================
+
+Specifying a ``log_file`` config option will now cause Synapse to refuse to
+start, and should be replaced by with the ``log_config`` option. Support for
+the ``log_file`` option was removed in v1.3.0 and has since had no effect.
+
+
 Upgrading to v1.7.0
 ===================