Commit 3acf0904 authored by Achilleas Pipinellis's avatar Achilleas Pipinellis

Merge branch 'fix-typo-sidekiq-memory-killer-document' into 'master'

Fix typo in Sidekiq memory killer document

See merge request gitlab-org/gitlab!38132
parents 6e05bfe3 130a44ec
...@@ -71,5 +71,5 @@ The MemoryKiller is controlled using environment variables. ...@@ -71,5 +71,5 @@ The MemoryKiller is controlled using environment variables.
If the process hard shutdown/restart is not performed by Sidekiq, If the process hard shutdown/restart is not performed by Sidekiq,
the Sidekiq process will be forcefully terminated after the Sidekiq process will be forcefully terminated after
`Sidekiq.options[:timeout] * 2` seconds. An external supervision mechanism `Sidekiq.options[:timeout] + 2` seconds. An external supervision mechanism
(e.g. runit) must restart Sidekiq afterwards. (e.g. runit) must restart Sidekiq afterwards.
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