summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Smith <tsmith@chef.io>2021-01-08 10:35:13 -0800
committerGitHub <noreply@github.com>2021-01-08 10:35:13 -0800
commit51f8084f32c007ffa5853c0a96fb46bf2ec50c78 (patch)
tree63211ad3d251422786204b5386c81e5806dcd1ca
parent0d483a4ebdb900534e020de6356201ddde379161 (diff)
parentd822f40c98fa71fd7b9a7f6c3b8ccec2512a2ba2 (diff)
downloadchef-51f8084f32c007ffa5853c0a96fb46bf2ec50c78.tar.gz
Merge pull request #10853 from chef/chef-zero
Update chef-zero to pull in webrick
-rw-r--r--Gemfile.lock4
1 files changed, 3 insertions, 1 deletions
diff --git a/Gemfile.lock b/Gemfile.lock
index 23c9512de6..0a7de00b1c 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -155,12 +155,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
@@ -365,6 +366,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