diff options
| author | Thom May <thom@may.lt> | 2017-10-19 04:47:10 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-10-19 04:47:10 -0400 |
| commit | 0480bc06acbc03ad42346c76dd67092611554528 (patch) | |
| tree | f42f16450eba1c940bb936876bbeffc439caee04 | |
| parent | 866bc6b872683d9f7a48fbed1a2c72ecff23f314 (diff) | |
| parent | 175794dd9e734355678d4a18b3e3f092705b335c (diff) | |
| download | chef-0480bc06acbc03ad42346c76dd67092611554528.tar.gz | |
Merge pull request #6509 from chef/ohai_825
Pull in Ohai 8.25
| -rw-r--r-- | Gemfile.lock | 2 | ||||
| -rw-r--r-- | omnibus/Gemfile.lock | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 169c8f9632..5c7ebce635 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -329,7 +329,7 @@ GEM nori (2.6.0) octokit (4.7.0) sawyer (~> 0.8.0, >= 0.5.3) - ohai (8.24.1) + ohai (8.25.0) chef-config (>= 12.5.0.alpha.1, < 14) ffi (~> 1.9) ffi-yajl (~> 2.2) diff --git a/omnibus/Gemfile.lock b/omnibus/Gemfile.lock index 229ed6b4ef..8de20d810a 100644 --- a/omnibus/Gemfile.lock +++ b/omnibus/Gemfile.lock @@ -153,7 +153,7 @@ GEM nori (2.6.0) octokit (4.7.0) sawyer (~> 0.8.0, >= 0.5.3) - ohai (8.24.1) + ohai (8.25.0) chef-config (>= 12.5.0.alpha.1, < 14) ffi (~> 1.9) ffi-yajl (~> 2.2) |