summary refs log tree commit diff
diff options
context:
space:
mode:
authorRichard van der Hoff <1389908+richvdh@users.noreply.github.com>2019-01-16 23:14:41 +0000
committerGitHub <noreply@github.com>2019-01-16 23:14:41 +0000
commit3982a6ee078bdec3b25ab7850161cb0cb7157590 (patch)
tree9cb08dd5b3fd6bd597bc86280e8e8a5d9d87c84c
parentdon't store more remote device lists if they have more than 1K devices (#4397) (diff)
downloadsynapse-3982a6ee078bdec3b25ab7850161cb0cb7157590.tar.xz
Changing macaroon_secret_key no longer logs you out (#4387)
-rw-r--r--changelog.d/4387.misc1
-rw-r--r--synapse/config/key.py3
2 files changed, 1 insertions, 3 deletions
diff --git a/changelog.d/4387.misc b/changelog.d/4387.misc
new file mode 100644
index 0000000000..0c04a0fa9b
--- /dev/null
+++ b/changelog.d/4387.misc
@@ -0,0 +1 @@
+Fix a comment in the generated config file
diff --git a/synapse/config/key.py b/synapse/config/key.py
index 3b11f0cfa9..dce4b19a2d 100644
--- a/synapse/config/key.py
+++ b/synapse/config/key.py
@@ -83,9 +83,6 @@ class KeyConfig(Config):
         # a secret which is used to sign access tokens. If none is specified,
         # the registration_shared_secret is used, if one is given; otherwise,
         # a secret key is derived from the signing key.
-        #
-        # Note that changing this will invalidate any active access tokens, so
-        # all clients will have to log back in.
         %(macaroon_secret_key)s
 
         # Used to enable access token expiration.