summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Smith <tsmith@chef.io>2019-02-07 13:31:18 -0800
committerGitHub <noreply@github.com>2019-02-07 13:31:18 -0800
commit8da05740566e6859b4b4b7fef1524b4b8e2e4cd5 (patch)
tree167bf256ae9f8fb30414fe91c84282f063ba17d4
parentf235bc6eae412ad85eed6225de584d0a1e8a8f59 (diff)
parent1d86d2fe28fdcaae032f0887b96d74ef51aadd47 (diff)
downloadchef-8da05740566e6859b4b4b7fef1524b4b8e2e4cd5.tar.gz
Merge pull request #8223 from chef/new_ohai_13
Update Ohai to 13.12.6
-rw-r--r--Gemfile.lock4
1 files changed, 2 insertions, 2 deletions
diff --git a/Gemfile.lock b/Gemfile.lock
index 0865e0e5e5..3220918827 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -212,12 +212,12 @@ GEM
nori (2.6.0)
octokit (4.13.0)
sawyer (~> 0.8.0, >= 0.5.3)
- ohai (13.12.4)
+ ohai (13.12.6)
chef-config (>= 12.5.0.alpha.1, < 14)
ffi (~> 1.9)
ffi-yajl (~> 2.2)
ipaddress
- mixlib-cli
+ mixlib-cli (< 2.0)
mixlib-config (~> 2.0)
mixlib-log (>= 1.7.1, < 2.0)
mixlib-shellout (~> 2.0)