diff options
| author | Job van der Voort <job@gitlab.com> | 2015-05-08 09:01:10 +0000 |
|---|---|---|
| committer | Job van der Voort <job@gitlab.com> | 2015-05-08 09:01:10 +0000 |
| commit | 0384d2929f25e433d394db70cfc29896fadaa4a5 (patch) | |
| tree | ba01391460943c9978c5ff8d761ddaa7ca4978c3 /CHANGELOG | |
| parent | 0fc6f0b5d406f530e9ad8a35f0188536f6525cb9 (diff) | |
| parent | 1c1f18b416febb8296facca37dc7504c2da880f8 (diff) | |
| download | gitlab-ce-0384d2929f25e433d394db70cfc29896fadaa4a5.tar.gz | |
Merge branch 'sidekiq-memory-killer-shutdown-signal' into 'master'
Add SIDEKIQ_MEMORY_KILLER_SHUTDOWN_SIGNAL env var
It looks like SIGTERM may not be enough to shut down a Sidekiq process
when its RSS has gotten too big. This change will allow us to experiment
with sending SIGKILL instead of SIGTERM to Sidekiq processes on
gitlab.com.
See merge request !1812
Diffstat (limited to 'CHANGELOG')
| -rw-r--r-- | CHANGELOG | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/CHANGELOG b/CHANGELOG index 77d5f07eb5c..b03f1efa990 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -47,6 +47,7 @@ v 7.11.0 (unreleased) - Allow to use non-ASCII letters and dashes in project and namespace name. (Jakub Jirutka) - Add footnotes support to Markdown (Guillaume Delbergue) - Add current_sign_in_at to UserFull REST api. + - Make Sidekiq MemoryKiller shutdown signal configurable v 7.10.2 - Fix CI links on MR page |