summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Smith <tsmith@chef.io>2018-12-05 09:32:11 -0800
committerGitHub <noreply@github.com>2018-12-05 09:32:11 -0800
commit1dbe3053549c0f73ec4eab2dd69f6f0cc731ef90 (patch)
treebb9e3139d1b3566bae972505b6e49ad350f7c86c
parent01c215a5800defe78361e0c93a03ac3cac88e92b (diff)
parent78aabcd39322f7790491a33cf84369febe1a33f2 (diff)
downloadchef-1dbe3053549c0f73ec4eab2dd69f6f0cc731ef90.tar.gz
Merge pull request #8010 from chef/inspec_bump
Update InSpec to 3.0.61 and Ohai to 15.0.20
-rw-r--r--Gemfile.lock6
-rw-r--r--omnibus/Gemfile.lock12
2 files changed, 10 insertions, 8 deletions
diff --git a/Gemfile.lock b/Gemfile.lock
index 4b2e9cd7f6..c55efaead3 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -114,7 +114,8 @@ PATH
GEM
remote: https://rubygems.org/
specs:
- addressable (2.4.0)
+ addressable (2.5.2)
+ public_suffix (>= 2.0.2, < 4.0)
appbundler (0.11.6)
mixlib-cli (~> 1.4)
mixlib-shellout (~> 2.0)
@@ -167,7 +168,7 @@ GEM
highline (1.7.10)
htmlentities (4.3.4)
iniparse (1.4.4)
- inspec-core (3.0.52)
+ inspec-core (3.0.61)
addressable (~> 2.4)
faraday (>= 0.9.0)
hashie (~> 3.4)
@@ -244,6 +245,7 @@ GEM
pry-stack_explorer (0.4.9.3)
binding_of_caller (>= 0.7)
pry (>= 0.9.11)
+ public_suffix (3.0.3)
pusher-client (0.6.2)
json
websocket (~> 1.0)
diff --git a/omnibus/Gemfile.lock b/omnibus/Gemfile.lock
index 3e3c2ee7f8..7945857987 100644
--- a/omnibus/Gemfile.lock
+++ b/omnibus/Gemfile.lock
@@ -1,9 +1,9 @@
GIT
remote: https://github.com/chef/omnibus
- revision: ca035f744ece299cbdf81f52edb997b4ba1693b2
+ revision: 708e9c7413c83a6e19a40e212ad884c78a905a5d
branch: master
specs:
- omnibus (6.0.7)
+ omnibus (6.0.8)
aws-sdk-s3 (~> 1)
chef-sugar (>= 3.3)
cleanroom (~> 1.0)
@@ -32,8 +32,8 @@ GEM
public_suffix (>= 2.0.2, < 4.0)
awesome_print (1.8.0)
aws-eventstream (1.0.1)
- aws-partitions (1.117.0)
- aws-sdk-core (3.40.0)
+ aws-partitions (1.121.0)
+ aws-sdk-core (3.42.0)
aws-eventstream (~> 1.0)
aws-partitions (~> 1.0)
aws-sigv4 (~> 1.0)
@@ -41,7 +41,7 @@ GEM
aws-sdk-kms (1.13.0)
aws-sdk-core (~> 3, >= 3.39.0)
aws-sigv4 (~> 1.0)
- aws-sdk-s3 (1.27.0)
+ aws-sdk-s3 (1.29.0)
aws-sdk-core (~> 3, >= 3.39.0)
aws-sdk-kms (~> 1)
aws-sigv4 (~> 1.0)
@@ -302,7 +302,7 @@ GEM
structured_warnings (0.3.0)
syslog-logger (1.6.8)
systemu (2.6.5)
- test-kitchen (1.23.2)
+ test-kitchen (1.23.3)
mixlib-install (~> 3.6)
mixlib-shellout (>= 1.2, < 3.0)
net-scp (~> 1.1)