Commit 988ac03b authored by Dmytro Zaporozhets's avatar Dmytro Zaporozhets

Merge branch 'careful_sidekiq_kill' into 'master'

Be more selective when killing stray Sidekiqs
parents 11e1c013 8e2752f4
......@@ -32,6 +32,7 @@ v 7.0.0
- File action in satellites uses default 30 seconds timeout instead of old 10 seconds one
- Overall performance improvements
- Skip init script check on omnibus-gitlab
- Be more selective when killing stray Sidekiqs
v 6.9.2
- Revert the commit that broke the LDAP user filter
......
......@@ -18,7 +18,7 @@ function stop
function killall
{
pkill -u $gitlab_user -f sidekiq
pkill -u $gitlab_user -f 'sidekiq [0-9]'
}
function restart
......
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