Commit 75e33e23 authored by Sytse Sijbrandij's avatar Sytse Sijbrandij

Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce

Conflicts:
	doc/install/requirements.md
parents 540656f9 d8c9d948
...@@ -57,6 +57,7 @@ If you have enough RAM memory and a recent CPU the speed of GitLab is mainly lim ...@@ -57,6 +57,7 @@ If you have enough RAM memory and a recent CPU the speed of GitLab is mainly lim
- 16 cores supports up to 10,000 users - 16 cores supports up to 10,000 users
- 32 cores supports up to 20,000 users - 32 cores supports up to 20,000 users
- 64 cores supports up to 40,000 users - 64 cores supports up to 40,000 users
- More users? Run it on [multiple application servers](https://about.gitlab.com/high-availability/)
### Memory ### Memory
...@@ -72,8 +73,9 @@ With less memory GitLab will give strange errors during the reconfigure run and ...@@ -72,8 +73,9 @@ With less memory GitLab will give strange errors during the reconfigure run and
- 32GB RAM supports up to 8,000 users - 32GB RAM supports up to 8,000 users
- 64GB RAM supports up to 16,000 users - 64GB RAM supports up to 16,000 users
- 128GB RAM supports up to 32,000 users - 128GB RAM supports up to 32,000 users
- More users? Run it on [multiple application servers](https://about.gitlab.com/high-availability/)
Notice: 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. Notice: 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 many you need of those.
## Unicorn Workers ## Unicorn Workers
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment