summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Smith <tsmith@chef.io>2021-01-08 14:59:40 -0800
committerGitHub <noreply@github.com>2021-01-08 14:59:40 -0800
commitba655617a3ed3226581a6b39e907926eca58ee1f (patch)
tree7f5a49e69f8f3a72f57be2c26a7470822b9efc29
parent2c15e2cebed7c9976addd61f71ba4b353409f68c (diff)
parent6ee20159b964393ae37236dca1f000596c2c1448 (diff)
downloadchef-ba655617a3ed3226581a6b39e907926eca58ee1f.tar.gz
Merge pull request #10857 from chef/bumps_16_again
Update chef-zero to 15.0.4 to resolve missing dep failures
-rw-r--r--Gemfile.lock4
-rw-r--r--omnibus/Gemfile.lock36
2 files changed, 22 insertions, 18 deletions
diff --git a/Gemfile.lock b/Gemfile.lock
index 2458790b7b..b6c37fc7a3 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -149,12 +149,13 @@ GEM
concurrent-ruby (~> 1.0)
ffi-yajl (~> 2.2)
chef-vault (4.1.0)
- chef-zero (15.0.3)
+ chef-zero (15.0.4)
ffi-yajl (~> 2.2)
hashie (>= 2.0, < 5.0)
mixlib-log (>= 2.0, < 4.0)
rack (~> 2.0, >= 2.0.6)
uuidtools (~> 2.1)
+ webrick
cheffish (16.0.12)
chef-zero (>= 14.0)
net-ssh
@@ -362,6 +363,7 @@ GEM
addressable (>= 2.3.6)
crack (>= 0.3.2)
hashdiff (>= 0.4.0, < 2.0.0)
+ webrick (1.7.0)
win32-api (1.5.3-universal-mingw32)
win32-certstore (0.4.1)
ffi
diff --git a/omnibus/Gemfile.lock b/omnibus/Gemfile.lock
index ec158858e2..de668d1de6 100644
--- a/omnibus/Gemfile.lock
+++ b/omnibus/Gemfile.lock
@@ -32,7 +32,7 @@ GEM
artifactory (3.0.15)
awesome_print (1.8.0)
aws-eventstream (1.1.0)
- aws-partitions (1.414.0)
+ aws-partitions (1.415.0)
aws-sdk-core (3.110.0)
aws-eventstream (~> 1, >= 1.0.2)
aws-partitions (~> 1, >= 1.239.0)
@@ -47,9 +47,9 @@ GEM
aws-sigv4 (~> 1.1)
aws-sigv4 (1.2.2)
aws-eventstream (~> 1, >= 1.0.2)
- bcrypt_pbkdf (1.1.0.rc1)
- bcrypt_pbkdf (1.1.0.rc1-x64-mingw32)
- bcrypt_pbkdf (1.1.0.rc1-x86-mingw32)
+ bcrypt_pbkdf (1.1.0.rc2)
+ bcrypt_pbkdf (1.1.0.rc2-x64-mingw32)
+ bcrypt_pbkdf (1.1.0.rc2-x86-mingw32)
berkshelf (7.1.0)
chef (>= 15.7.32)
chef-config
@@ -64,12 +64,12 @@ GEM
solve (~> 4.0)
thor (>= 0.20)
builder (3.2.4)
- chef (16.8.14)
+ chef (16.9.16)
addressable
- bcrypt_pbkdf (= 1.1.0.rc1)
+ bcrypt_pbkdf (= 1.1.0.rc2)
bundler (>= 1.10)
- chef-config (= 16.8.14)
- chef-utils (= 16.8.14)
+ chef-config (= 16.9.16)
+ chef-utils (= 16.9.16)
chef-vault
chef-zero (>= 14.0.11)
diff-lcs (>= 1.2.4, < 1.4.0)
@@ -101,12 +101,12 @@ GEM
tty-screen (~> 0.6)
tty-table (~> 0.11)
uuidtools (~> 2.1.5)
- chef (16.8.14-universal-mingw32)
+ chef (16.9.16-universal-mingw32)
addressable
- bcrypt_pbkdf (= 1.1.0.rc1)
+ bcrypt_pbkdf (= 1.1.0.rc2)
bundler (>= 1.10)
- chef-config (= 16.8.14)
- chef-utils (= 16.8.14)
+ chef-config (= 16.9.16)
+ chef-utils (= 16.9.16)
chef-vault
chef-zero (>= 14.0.11)
diff-lcs (>= 1.2.4, < 1.4.0)
@@ -150,9 +150,9 @@ GEM
win32-taskscheduler (~> 2.0)
wmi-lite (~> 1.0)
chef-cleanroom (1.0.2)
- chef-config (16.8.14)
+ chef-config (16.9.16)
addressable
- chef-utils (= 16.8.14)
+ chef-utils (= 16.9.16)
fuzzyurl
mixlib-config (>= 2.2.12, < 4.0)
mixlib-shellout (>= 2.0, < 4.0)
@@ -161,14 +161,15 @@ GEM
chef-config
concurrent-ruby (~> 1.0)
ffi-yajl (~> 2.2)
- chef-utils (16.8.14)
+ chef-utils (16.9.16)
chef-vault (4.1.0)
- chef-zero (15.0.3)
+ chef-zero (15.0.4)
ffi-yajl (~> 2.2)
hashie (>= 2.0, < 5.0)
mixlib-log (>= 2.0, < 4.0)
rack (~> 2.0, >= 2.0.6)
uuidtools (~> 2.1)
+ webrick
citrus (3.0.2)
cleanroom (1.0.0)
coderay (1.1.3)
@@ -198,7 +199,7 @@ GEM
highline (2.0.3)
httpclient (2.8.3)
iniparse (1.5.0)
- inspec-core (4.24.26)
+ inspec-core (4.24.28)
addressable (~> 2.4)
chef-telemetry (~> 1.0)
faraday (>= 0.9.0, < 1.2)
@@ -397,6 +398,7 @@ GEM
unicode-display_width (1.7.0)
unicode_utils (1.4.0)
uuidtools (2.1.5)
+ webrick (1.7.0)
win32-api (1.5.3-universal-mingw32)
win32-certstore (0.4.1)
ffi