summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Smith <tsmith@chef.io>2018-09-17 16:18:55 -0700
committerGitHub <noreply@github.com>2018-09-17 16:18:55 -0700
commit73c3b32aa2559bd282aa0e869b2675ced4fd35ed (patch)
tree09cbd47d33533797b6ff0297e2b17b70add6c89f
parent4383cc3ee5c75174459f3cc0813d4a48e2b96442 (diff)
parent0c1b58f69ea7c94eab98d5c03e7d754900a6e51d (diff)
downloadchef-73c3b32aa2559bd282aa0e869b2675ced4fd35ed.tar.gz
Merge pull request #7657 from chef/bumps
Bump InSpec and Ohai to the latest
-rw-r--r--Gemfile.lock4
-rw-r--r--omnibus/Gemfile.lock16
2 files changed, 10 insertions, 10 deletions
diff --git a/Gemfile.lock b/Gemfile.lock
index 0af4a8ae66..e8d48ab800 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -149,7 +149,7 @@ GEM
highline (1.7.10)
htmlentities (4.3.4)
iniparse (1.4.4)
- inspec-core (2.2.101)
+ inspec-core (2.2.102)
addressable (~> 2.4)
faraday (>= 0.9.0)
hashie (~> 3.4)
@@ -205,7 +205,7 @@ GEM
netrc (0.11.0)
octokit (4.12.0)
sawyer (~> 0.8.0, >= 0.5.3)
- ohai (14.5.0)
+ ohai (14.5.4)
chef-config (>= 12.8, < 15)
ffi (~> 1.9)
ffi-yajl (~> 2.2)
diff --git a/omnibus/Gemfile.lock b/omnibus/Gemfile.lock
index b0f1ed5f10..f852414e30 100644
--- a/omnibus/Gemfile.lock
+++ b/omnibus/Gemfile.lock
@@ -18,7 +18,7 @@ GIT
GIT
remote: https://github.com/chef/omnibus-software
- revision: 2f7131e7ec2043041771e752072c92062e48864a
+ revision: 26628b89c8baf74568c4bf1eb049192d6bacea5c
branch: master
specs:
omnibus-software (4.0.0)
@@ -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.130)
- aws-sdk-resources (= 2.11.130)
- aws-sdk-core (2.11.130)
+ aws-sdk (2.11.131)
+ aws-sdk-resources (= 2.11.131)
+ aws-sdk-core (2.11.131)
aws-sigv4 (~> 1.0)
jmespath (~> 1.0)
- aws-sdk-resources (2.11.130)
- aws-sdk-core (= 2.11.130)
+ aws-sdk-resources (2.11.131)
+ aws-sdk-core (= 2.11.131)
aws-sigv4 (1.0.3)
berkshelf (7.0.6)
chef (>= 13.6.52)
@@ -171,7 +171,7 @@ GEM
ipaddress (0.8.3)
iso8601 (0.11.0)
jmespath (1.4.0)
- kitchen-vagrant (1.3.3)
+ kitchen-vagrant (1.3.4)
test-kitchen (~> 1.4)
libyajl2 (1.2.0)
license_scout (1.0.15)
@@ -217,7 +217,7 @@ GEM
nori (2.6.0)
octokit (4.12.0)
sawyer (~> 0.8.0, >= 0.5.3)
- ohai (14.4.2)
+ ohai (14.5.4)
chef-config (>= 12.8, < 15)
ffi (~> 1.9)
ffi-yajl (~> 2.2)