summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Smith <tsmith@chef.io>2018-08-23 22:26:43 -0700
committerGitHub <noreply@github.com>2018-08-23 22:26:43 -0700
commit2fb4f13b3e488d5f5147a09862221bc462f49035 (patch)
treeb9d651d43762c6153743abf6b21fc622cef41200
parent8d393010ccdd1589b4d7255c6910501c7501d031 (diff)
parentdd288944c63c8ac8d876bf81cacda2449d4b9768 (diff)
downloadchef-2fb4f13b3e488d5f5147a09862221bc462f49035.tar.gz
Merge pull request #7581 from chef/bumps
Pull in latest omnibus definitions + new inspec/train
-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 21b49b6c46..601fd663bb 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.64)
+ inspec-core (2.2.70)
addressable (~> 2.4)
faraday (>= 0.9.0)
hashie (~> 3.4)
@@ -300,7 +300,7 @@ GEM
systemu (2.6.5)
thor (0.20.0)
tomlrb (1.2.7)
- train-core (1.4.31)
+ train-core (1.4.35)
json (>= 1.8, < 3.0)
mixlib-shellout (~> 2.0)
travis (1.8.9)
diff --git a/omnibus/Gemfile.lock b/omnibus/Gemfile.lock
index 76a24bf77e..0f30245639 100644
--- a/omnibus/Gemfile.lock
+++ b/omnibus/Gemfile.lock
@@ -18,7 +18,7 @@ GIT
GIT
remote: https://github.com/chef/omnibus-software
- revision: 3511a7f7d237bf6875dce88e8627055d6cd61cbe
+ revision: 56ae031dc36c9c060eb94709dd30f13ac50bc3f2
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.113)
- aws-sdk-resources (= 2.11.113)
- aws-sdk-core (2.11.113)
+ aws-sdk (2.11.115)
+ aws-sdk-resources (= 2.11.115)
+ aws-sdk-core (2.11.115)
aws-sigv4 (~> 1.0)
jmespath (~> 1.0)
- aws-sdk-resources (2.11.113)
- aws-sdk-core (= 2.11.113)
+ aws-sdk-resources (2.11.115)
+ aws-sdk-core (= 2.11.115)
aws-sigv4 (1.0.3)
berkshelf (4.3.5)
addressable (~> 2.3, >= 2.3.4)