diff options
| author | Stan Hu <stanhu@gmail.com> | 2019-08-13 04:15:29 +0000 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2019-08-13 04:15:29 +0000 |
| commit | 6680cc4ea2393955a60d042137e546e627cf8e32 (patch) | |
| tree | c61a762716b2b19ad64849cf1176d64015f2e8be | |
| parent | 6480bd6dc9f2e32bf3651606e836516cad65c2c8 (diff) | |
| parent | f38feb8a283b3dea3b90a28cbde35a81ff06069b (diff) | |
| download | gitlab-ce-6680cc4ea2393955a60d042137e546e627cf8e32.tar.gz | |
Merge branch 'patch-74' into 'master'
update duplication of unicorn min environment variable
See merge request gitlab-org/gitlab-ce!31749
| -rw-r--r-- | doc/administration/operations/unicorn.md | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/administration/operations/unicorn.md b/doc/administration/operations/unicorn.md index ae67d7f08d6..8178cb243f3 100644 --- a/doc/administration/operations/unicorn.md +++ b/doc/administration/operations/unicorn.md @@ -69,7 +69,7 @@ unicorn['worker_memory_limit_min'] = "400 * 1 << 20" unicorn['worker_memory_limit_max'] = "650 * 1 << 20" ``` -Otherwise, you can set the `GITLAB_UNICORN_MEMORY_MIN` and `GITLAB_UNICORN_MEMORY_MIN` +Otherwise, you can set the `GITLAB_UNICORN_MEMORY_MIN` and `GITLAB_UNICORN_MEMORY_MAX` [environment variables](../environment_variables.md). This is what a Unicorn worker memory restart looks like in unicorn_stderr.log. |