summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAchilleas Pipinellis <axil@gitlab.com>2019-08-11 05:22:30 +0000
committerAchilleas Pipinellis <axil@gitlab.com>2019-08-11 05:22:30 +0000
commit22dc7a0ca8ca9213e255b5d316ad9bbdc05cf41f (patch)
tree71cf0053ad07bd282eeb2df47213cfc8900dfca9
parent01b736fb050cf5375ca23785731831f4d3ad08c9 (diff)
parent3d76a2e241349136001b7be736fb93dcaae85e28 (diff)
downloadgitlab-ce-22dc7a0ca8ca9213e255b5d316ad9bbdc05cf41f.tar.gz
Merge branch 'emilie-master-patch-19291' into 'master'
Make clearer that memory team is working to reduce memory requirement See merge request gitlab-org/gitlab-ce!31647
-rw-r--r--doc/install/requirements.md5
1 files changed, 3 insertions, 2 deletions
diff --git a/doc/install/requirements.md b/doc/install/requirements.md
index 086f3b1b843..83a9e7fe294 100644
--- a/doc/install/requirements.md
+++ b/doc/install/requirements.md
@@ -92,8 +92,9 @@ We recommend having at least [2GB of swap on your server](https://askubuntu.com/
enough available RAM. Having swap will help reduce the chance of errors occurring
if your available memory changes. We also recommend [configuring the kernel's swappiness setting](https://askubuntu.com/a/103916)
to a low value like `10` to make the most of your RAM while still having the swap
-available when needed.
-Our [Memory Team](https://about.gitlab.com/handbook/engineering/development/enablement/memory/) is actively working to reduce this requirement.
+available when needed.
+
+Our [Memory Team](https://about.gitlab.com/handbook/engineering/development/enablement/memory/) is actively working to reduce the memory requirement.
NOTE: **Note:** The 25 workers of Sidekiq will show up as separate processes in your process overview (such as `top` or `htop`) but they share the same RAM allocation since Sidekiq is a multithreaded application. Please see the section below about Unicorn workers for information about how many you need of those.