summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Wilson <chris@chrisjwilson.com>2016-12-27 06:05:29 +0000
committerChris Wilson <chris@chrisjwilson.com>2016-12-27 14:16:45 +0800
commit80a1d74c7fabcdf8929c84a5be7bfcbbff629c8c (patch)
treea297cd95a0bca20344a06a523aeae4b4d5008dd7
parent796b5b575fe9ce54a4bee26cf389f135313e4d41 (diff)
downloadgitlab-ce-mrchrisw-update-vmstat.tar.gz
Update vmstat to version 2.3.0mrchrisw-update-vmstat
Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/26114 vmstat 2.3.0 fixes an issue with reporting the incorrect # of CPUs. This is used in the GitLab Admin Dashboard.
-rw-r--r--Gemfile2
-rw-r--r--Gemfile.lock4
2 files changed, 3 insertions, 3 deletions
diff --git a/Gemfile b/Gemfile
index 9dfaf7a48a2..c570759bb72 100644
--- a/Gemfile
+++ b/Gemfile
@@ -347,5 +347,5 @@ gem 'paranoia', '~> 2.2'
gem 'health_check', '~> 2.2.0'
# System information
-gem 'vmstat', '~> 2.2'
+gem 'vmstat', '~> 2.3.0'
gem 'sys-filesystem', '~> 1.1.6'
diff --git a/Gemfile.lock b/Gemfile.lock
index 9f8367b420a..a68d6bc7115 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -773,7 +773,7 @@ GEM
coercible (~> 1.0)
descendants_tracker (~> 0.0, >= 0.0.3)
equalizer (~> 0.0, >= 0.0.9)
- vmstat (2.2.0)
+ vmstat (2.3.0)
warden (1.2.6)
rack (>= 1.0)
web-console (2.3.0)
@@ -982,7 +982,7 @@ DEPENDENCIES
unicorn-worker-killer (~> 0.4.4)
version_sorter (~> 2.1.0)
virtus (~> 1.0.1)
- vmstat (~> 2.2)
+ vmstat (~> 2.3.0)
web-console (~> 2.0)
webmock (~> 1.21.0)
wikicloth (= 0.8.1)