summary refs log tree commit diff
path: root/docs/workers.md
diff options
context:
space:
mode:
authorRichard van der Hoff <richard@matrix.org>2021-03-24 12:45:54 +0000
committerRichard van der Hoff <richard@matrix.org>2021-03-24 12:45:54 +0000
commitea74189a903aec2437de31863d1bb3205f66995f (patch)
treeae56d5c6cc91cff675e0842b34da12abb0fa6a31 /docs/workers.md
parentRevert "Patch to temporarily drop cross-user m.key_share_requests (#8675)" (#... (diff)
parentSpaces summary: call out to other servers (#9653) (diff)
downloadsynapse-ea74189a903aec2437de31863d1bb3205f66995f.tar.xz
Merge remote-tracking branch 'origin/develop' into matrix-org-hotfixes
Diffstat (limited to 'docs/workers.md')
-rw-r--r--docs/workers.md3
1 files changed, 1 insertions, 2 deletions
diff --git a/docs/workers.md b/docs/workers.md

index e7bf9b8ce4..c6282165b0 100644 --- a/docs/workers.md +++ b/docs/workers.md
@@ -232,7 +232,6 @@ expressions: # Registration/login requests ^/_matrix/client/(api/v1|r0|unstable)/login$ ^/_matrix/client/(r0|unstable)/register$ - ^/_matrix/client/(r0|unstable)/auth/.*/fallback/web$ # Event sending requests ^/_matrix/client/(api/v1|r0|unstable)/rooms/.*/redact @@ -276,7 +275,7 @@ using): Ensure that all SSO logins go to a single process. For multiple workers not handling the SSO endpoints properly, see -[#7530](https://github.com/matrix-org/synapse/issues/7530) and +[#7530](https://github.com/matrix-org/synapse/issues/7530) and [#9427](https://github.com/matrix-org/synapse/issues/9427). Note that a HTTP listener with `client` and `federation` resources must be