summary refs log tree commit diff
path: root/CHANGES.rst
diff options
context:
space:
mode:
authorErik Johnston <erikj@jki.re>2018-01-12 12:00:07 +0000
committerGitHub <noreply@github.com>2018-01-12 12:00:07 +0000
commitfefeb0ab0ef57778f97a1a12ffbe8a2c9a3a7fb2 (patch)
tree98e7ace4f8e22fc5d242c6338795d18c75c02d9a /CHANGES.rst
parentMerge pull request #2766 from matrix-org/rav/room_event (diff)
parentActually make it work (diff)
downloadsynapse-fefeb0ab0ef57778f97a1a12ffbe8a2c9a3a7fb2.tar.xz
Merge pull request #2774 from matrix-org/erikj/synctl
When using synctl with workers, don't start the main synapse automatically
Diffstat (limited to 'CHANGES.rst')
-rw-r--r--CHANGES.rst7
1 files changed, 7 insertions, 0 deletions
diff --git a/CHANGES.rst b/CHANGES.rst
index dcf9adc95c..24e4e7a384 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,3 +1,10 @@
+Unreleased
+==========
+
+synctl no longer starts the main synapse when using ``-a`` option with workers.
+A new worker file should be added with ``worker_app: synapse.app.homeserver``
+
+
 Changes in synapse v0.26.0 (2018-01-05)
 =======================================