diff options
author | Douwe Maan <douwe@gitlab.com> | 2017-11-01 17:03:47 +0000 |
---|---|---|
committer | Douwe Maan <douwe@gitlab.com> | 2017-11-01 17:03:47 +0000 |
commit | 6ea9f0a33385e832c5a2525040f6916f120639e8 (patch) | |
tree | c86cddd31c800aaca9ea520bbda657aa22ae0fe2 /changelogs | |
parent | 101779e4e9fd83ef1890a7499ef9b2723fb75cbf (diff) | |
parent | 31e3f47280b6c33c7c9b6526ba82e262dd2bfa26 (diff) | |
download | gitlab-ce-6ea9f0a33385e832c5a2525040f6916f120639e8.tar.gz |
Merge branch 'sh-disable-unicorn-sampling-sidekiq' into 'master'
Disable Unicorn sampling in Sidekiq since there are no Unicorn sockets to monitor
See merge request gitlab-org/gitlab-ce!15128
Diffstat (limited to 'changelogs')
-rw-r--r-- | changelogs/unreleased/sh-disable-unicorn-sampling-sidekiq.yml | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/changelogs/unreleased/sh-disable-unicorn-sampling-sidekiq.yml b/changelogs/unreleased/sh-disable-unicorn-sampling-sidekiq.yml new file mode 100644 index 00000000000..c4ed017dacd --- /dev/null +++ b/changelogs/unreleased/sh-disable-unicorn-sampling-sidekiq.yml @@ -0,0 +1,5 @@ +--- +title: Disable Unicorn sampling in Sidekiq since there are no Unicorn sockets to monitor +merge_request: +author: +type: performance |