Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
heptapod
heptapod
Commits
4ff363febba5
Commit
988ac03b
authored
Jun 12, 2014
by
Dmitriy Zaporozhets
Browse files
Merge branch 'careful_sidekiq_kill' into 'master'
Be more selective when killing stray Sidekiqs
parents
51f00817286b
ca1ba1963980
Changes
2
Hide whitespace changes
Inline
Side-by-side
CHANGELOG
View file @
4ff363fe
...
...
@@ -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
...
...
bin/background_jobs
View file @
4ff363fe
...
...
@@ -18,7 +18,7 @@ function stop
function
killall
{
pkill
-u
$gitlab_user
-f
sidekiq
pkill
-u
$gitlab_user
-f
'
sidekiq
[0-9]'
}
function
restart
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment