summary refs log tree commit diff
path: root/synapse/config
diff options
context:
space:
mode:
authorRichard van der Hoff <richard@matrix.org>2018-08-02 15:43:30 +0100
committerRichard van der Hoff <richard@matrix.org>2018-08-02 15:43:30 +0100
commit704c3e62399b47970b1d319740e591a6f08366da (patch)
tree5e906af495e6f27ebd7977810dd3979efca7d35a /synapse/config
parentMerge pull request #3621 from matrix-org/erikj/split_fed_store (diff)
parentMerge tag 'v0.33.1' (diff)
downloadsynapse-704c3e62399b47970b1d319740e591a6f08366da.tar.xz
Merge branch 'master' into develop
Diffstat (limited to 'synapse/config')
-rw-r--r--synapse/config/server.py2
1 files changed, 2 insertions, 0 deletions
diff --git a/synapse/config/server.py b/synapse/config/server.py
index a8014e9c50..6a471a0a5e 100644
--- a/synapse/config/server.py
+++ b/synapse/config/server.py
@@ -217,6 +217,8 @@ class ServerConfig(Config):
         # different cores. See
         # https://www.mirantis.com/blog/improve-performance-python-programs-restricting-single-cpu/.
         #
+        # This setting requires the affinity package to be installed!
+        #
         # cpu_affinity: 0xFFFFFFFF
 
         # Whether to serve a web client from the HTTP/HTTPS root resource.