summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Smith <tsmith@chef.io>2018-07-17 17:01:38 -0700
committerGitHub <noreply@github.com>2018-07-17 17:01:38 -0700
commit0f4bb0dcc9fab37a5105e6358638d84a3f578458 (patch)
tree4c5a96227f559edccfafc29fe7038a8e7aea795e
parent282d50f1d01f0ebc09a6e79ea870e18240089dfc (diff)
parent15785d30df6bfbe8e6cd9d24425145e22cd6bbbb (diff)
downloadchef-0f4bb0dcc9fab37a5105e6358638d84a3f578458.tar.gz
Merge pull request #7487 from chef/bump_inspec
Pull in the latest inspec-core and train-core
-rw-r--r--Gemfile.lock8
-rw-r--r--omnibus/Gemfile.lock22
2 files changed, 15 insertions, 15 deletions
diff --git a/Gemfile.lock b/Gemfile.lock
index e7bfac150b..7994889b3b 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,6 +1,6 @@
GIT
remote: https://github.com/chef/chefstyle.git
- revision: c16b9ceab413259bda43a2d683f1f918c1be3db5
+ revision: 4a885da4a201b55f2a5568bc0ea054860ccbf3c3
branch: master
specs:
chefstyle (0.10.0)
@@ -149,7 +149,7 @@ GEM
highline (1.7.10)
htmlentities (4.3.4)
iniparse (1.4.4)
- inspec-core (2.2.34)
+ inspec-core (2.2.35)
addressable (~> 2.4)
faraday (>= 0.9.0)
hashie (~> 3.4)
@@ -217,7 +217,7 @@ GEM
systemu (~> 2.6.4)
wmi-lite (~> 1.0)
parallel (1.12.1)
- parser (2.5.1.0)
+ parser (2.5.1.2)
ast (~> 2.4.0)
parslet (1.8.2)
plist (3.4.0)
@@ -300,7 +300,7 @@ GEM
systemu (2.6.5)
thor (0.20.0)
tomlrb (1.2.7)
- train-core (1.4.21)
+ train-core (1.4.22)
json (>= 1.8, < 3.0)
mixlib-shellout (~> 2.0)
travis (1.8.8)
diff --git a/omnibus/Gemfile.lock b/omnibus/Gemfile.lock
index e639a0f771..bdbf0fd698 100644
--- a/omnibus/Gemfile.lock
+++ b/omnibus/Gemfile.lock
@@ -18,7 +18,7 @@ GIT
GIT
remote: https://github.com/chef/omnibus-software
- revision: ff6dbf50afc4ad4c2b157deb1f38bf636197ca55
+ revision: 836bd650d49e6350dfa40b43a1398c5847a6fd42
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.78)
- aws-sdk-resources (= 2.11.78)
- aws-sdk-core (2.11.78)
+ aws-sdk (2.11.90)
+ aws-sdk-resources (= 2.11.90)
+ aws-sdk-core (2.11.90)
aws-sigv4 (~> 1.0)
jmespath (~> 1.0)
- aws-sdk-resources (2.11.78)
- aws-sdk-core (= 2.11.78)
+ aws-sdk-resources (2.11.90)
+ aws-sdk-core (= 2.11.90)
aws-sigv4 (1.0.3)
berkshelf (4.3.5)
addressable (~> 2.3, >= 2.3.4)
@@ -78,10 +78,10 @@ GEM
celluloid-io (0.16.2)
celluloid (>= 0.16.0)
nio4r (>= 1.1.0)
- chef-config (13.9.4)
+ chef-config (13.10.0)
addressable
fuzzyurl
- mixlib-config (~> 2.0)
+ mixlib-config (>= 2.2.12, < 3.0)
mixlib-shellout (~> 2.0)
tomlrb (~> 1.2)
chef-sugar (3.6.0)
@@ -128,9 +128,9 @@ GEM
mixlib-log
mixlib-authentication (2.1.1)
mixlib-cli (1.7.0)
- mixlib-config (2.2.8)
+ mixlib-config (2.2.13)
tomlrb
- mixlib-install (3.10.0)
+ mixlib-install (3.11.2)
mixlib-shellout
mixlib-versioning
thor
@@ -152,7 +152,7 @@ GEM
nori (2.6.0)
octokit (4.9.0)
sawyer (~> 0.8.0, >= 0.5.3)
- ohai (13.9.2)
+ ohai (13.10.0)
chef-config (>= 12.5.0.alpha.1, < 14)
ffi (~> 1.9)
ffi-yajl (~> 2.2)