summaryrefslogtreecommitdiff
path: root/CHANGELOG
diff options
context:
space:
mode:
authorJacob Vosmaer <contact@jacobvosmaer.nl>2014-06-12 10:42:38 +0200
committerJacob Vosmaer <contact@jacobvosmaer.nl>2014-06-12 15:32:47 +0200
commit8e2752f4595db07197cacbf8c352e51b5268b71b (patch)
tree3b933cbadafc99ad75c4791ed7d1d1989f351dae /CHANGELOG
parent11e1c0134195270eabd2774055713699450ba49d (diff)
downloadgitlab-ce-8e2752f4595db07197cacbf8c352e51b5268b71b.tar.gz
Be more selective when killing stray Sidekiqs
Avoid the background_jobs script killing every process with 'sidekiq' in its argument string (e.g. 'rake gitlab:sidekiq start') by also catching the number (2) in 'sidekiq 2.14'.
Diffstat (limited to 'CHANGELOG')
-rw-r--r--CHANGELOG1
1 files changed, 1 insertions, 0 deletions
diff --git a/CHANGELOG b/CHANGELOG
index 435cc668f1e..2e4736a0803 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -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