summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLamont Granquist <lamont@scriptkiddie.org>2018-08-22 12:12:53 -0700
committerGitHub <noreply@github.com>2018-08-22 12:12:53 -0700
commitb2724a61a92abf9fd350908d059311b76926323d (patch)
tree4ca2247e18f9d6209837b5cae9d3df96ae85ca65
parent6a48305dedcc66ce317adab54dfd88d059b227d6 (diff)
parentd116218034004792696a5e1c4811d90a014490b1 (diff)
downloadchef-b2724a61a92abf9fd350908d059311b76926323d.tar.gz
Merge pull request #7570 from chef/bump_ohai
Update to Ohai 14.4.2
-rw-r--r--Gemfile.lock4
-rw-r--r--omnibus/Gemfile.lock12
2 files changed, 8 insertions, 8 deletions
diff --git a/Gemfile.lock b/Gemfile.lock
index 08eac1a473..1af319943d 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -204,7 +204,7 @@ GEM
netrc (0.11.0)
octokit (4.10.0)
sawyer (~> 0.8.0, >= 0.5.3)
- ohai (14.4.1)
+ ohai (14.4.2)
chef-config (>= 12.8, < 15)
ffi (~> 1.9)
ffi-yajl (~> 2.2)
@@ -377,4 +377,4 @@ DEPENDENCIES
yard
BUNDLED WITH
- 1.16.3
+ 1.16.4
diff --git a/omnibus/Gemfile.lock b/omnibus/Gemfile.lock
index 230980dc35..76a24bf77e 100644
--- a/omnibus/Gemfile.lock
+++ b/omnibus/Gemfile.lock
@@ -31,13 +31,13 @@ GEM
addressable (2.5.2)
public_suffix (>= 2.0.2, < 4.0)
awesome_print (1.8.0)
- aws-sdk (2.11.112)
- aws-sdk-resources (= 2.11.112)
- aws-sdk-core (2.11.112)
+ aws-sdk (2.11.113)
+ aws-sdk-resources (= 2.11.113)
+ aws-sdk-core (2.11.113)
aws-sigv4 (~> 1.0)
jmespath (~> 1.0)
- aws-sdk-resources (2.11.112)
- aws-sdk-core (= 2.11.112)
+ aws-sdk-resources (2.11.113)
+ aws-sdk-core (= 2.11.113)
aws-sigv4 (1.0.3)
berkshelf (4.3.5)
addressable (~> 2.3, >= 2.3.4)
@@ -272,4 +272,4 @@ DEPENDENCIES
winrm-fs (~> 1.0)
BUNDLED WITH
- 1.16.3
+ 1.16.4