summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Smith <tsmith@chef.io>2019-03-19 14:58:39 -0700
committerGitHub <noreply@github.com>2019-03-19 14:58:39 -0700
commit0c3b65e31c4106a05697612950903f1a327438c1 (patch)
tree9d9975d79f5e41d914cf3e80440353afdcb6e308
parent7aeb9dd9e3fb2710f97270c7c6ef838d961d50b7 (diff)
parent8e42684b1068f87a160c3a42c2ff02a8c8b01d4b (diff)
downloadchef-0c3b65e31c4106a05697612950903f1a327438c1.tar.gz
Merge pull request #8312 from chef/dep_bump
Update chef-zero to 14.0.12
-rw-r--r--Gemfile.lock6
-rw-r--r--omnibus/Gemfile.lock10
2 files changed, 8 insertions, 8 deletions
diff --git a/Gemfile.lock b/Gemfile.lock
index b5f6cae048..a3e5129946 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -113,10 +113,10 @@ GEM
builder (3.2.3)
byebug (11.0.1)
chef-vault (3.4.3)
- chef-zero (14.0.11)
+ chef-zero (14.0.12)
ffi-yajl (~> 2.2)
hashie (>= 2.0, < 4.0)
- mixlib-log (~> 2.0)
+ mixlib-log (>= 2.0, < 4.0)
rack (~> 2.0, >= 2.0.6)
uuidtools (~> 2.1)
cheffish (14.0.4)
@@ -182,7 +182,7 @@ GEM
mixlib-cli (2.0.1)
mixlib-config (2.2.18)
tomlrb
- mixlib-log (2.0.9)
+ mixlib-log (3.0.1)
mixlib-shellout (2.4.4)
mixlib-shellout (2.4.4-universal-mingw32)
win32-process (~> 0.8.2)
diff --git a/omnibus/Gemfile.lock b/omnibus/Gemfile.lock
index 1634ad0e9b..a9e4dc2f90 100644
--- a/omnibus/Gemfile.lock
+++ b/omnibus/Gemfile.lock
@@ -33,7 +33,7 @@ GEM
awesome_print (1.8.0)
aws-eventstream (1.0.2)
aws-partitions (1.144.0)
- aws-sdk-core (3.48.0)
+ aws-sdk-core (3.48.1)
aws-eventstream (~> 1.0, >= 1.0.2)
aws-partitions (~> 1.0)
aws-sigv4 (~> 1.1)
@@ -141,10 +141,10 @@ GEM
mixlib-shellout (~> 2.0)
tomlrb (~> 1.2)
chef-sugar (5.0.1)
- chef-zero (14.0.11)
+ chef-zero (14.0.12)
ffi-yajl (~> 2.2)
hashie (>= 2.0, < 4.0)
- mixlib-log (~> 2.0)
+ mixlib-log (>= 2.0, < 4.0)
rack (~> 2.0, >= 2.0.6)
uuidtools (~> 2.1)
citrus (3.0.2)
@@ -174,8 +174,8 @@ GEM
ipaddress (0.8.3)
iso8601 (0.12.1)
jmespath (1.4.0)
- kitchen-vagrant (1.5.0)
- test-kitchen (~> 1.4)
+ kitchen-vagrant (1.5.1)
+ test-kitchen (>= 1.4, < 3)
libyajl2 (1.2.0)
license_scout (1.0.22)
ffi-yajl (~> 2.2)