diff options
| author | Stan Hu <stanhu@gmail.com> | 2016-12-28 01:37:59 +0000 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2016-12-28 01:37:59 +0000 |
| commit | b93c72e33a50aaed845fe333dee0201b0b11934e (patch) | |
| tree | 0a36939d14379ed7585db6e38b9b7f449f809bff | |
| parent | d9c94a8b9236e4f8eb140260182d3d8d963495b5 (diff) | |
| parent | 80a1d74c7fabcdf8929c84a5be7bfcbbff629c8c (diff) | |
| download | gitlab-ce-b93c72e33a50aaed845fe333dee0201b0b11934e.tar.gz | |
Merge branch 'mrchrisw-update-vmstat' into 'master'
Update vmstat to version 2.3.0
Closes #26114
See merge request !8318
| -rw-r--r-- | Gemfile | 2 | ||||
| -rw-r--r-- | Gemfile.lock | 4 |
2 files changed, 3 insertions, 3 deletions
@@ -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 765d57c6238..1c192d2fc6e 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) |