diff options
| author | Stan Hu <stanhu@gmail.com> | 2016-07-21 17:36:15 +0000 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2016-07-21 17:36:15 +0000 |
| commit | 2cc3b893bb195a99faa89f1fa62e592e934bf7d9 (patch) | |
| tree | b961dcfedb92b47f2624be275bb87efe66f16beb | |
| parent | 2af769c336e0a2498333ea8b4d7b7c87810ca5f0 (diff) | |
| parent | b2a4b6defefb081e97c7c57123b9e64b209bdd20 (diff) | |
| download | gitlab-ce-2cc3b893bb195a99faa89f1fa62e592e934bf7d9.tar.gz | |
Merge branch 'bump-vmstat-version' into 'master'
Bump vmstat version to fix issues reporting on FreeBSD
Minor changes from 2.1.0 to 2.1.1:
https://github.com/threez/ruby-vmstat/commits/master
See merge request !5405
| -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.0' gem 'health_check', '~> 2.1.0' # System information -gem 'vmstat', '~> 2.1.0' +gem 'vmstat', '~> 2.1.1' gem 'sys-filesystem', '~> 1.1.6' diff --git a/Gemfile.lock b/Gemfile.lock index 8739f8579d5..e2b3d55ee0c 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -775,7 +775,7 @@ GEM coercible (~> 1.0) descendants_tracker (~> 0.0, >= 0.0.3) equalizer (~> 0.0, >= 0.0.9) - vmstat (2.1.0) + vmstat (2.1.1) warden (1.2.6) rack (>= 1.0) web-console (2.3.0) @@ -980,7 +980,7 @@ DEPENDENCIES unicorn-worker-killer (~> 0.4.2) version_sorter (~> 2.0.0) virtus (~> 1.0.1) - vmstat (~> 2.1.0) + vmstat (~> 2.1.1) web-console (~> 2.0) webmock (~> 1.21.0) wikicloth (= 0.8.1) |