summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Smith <tsmith@chef.io>2021-02-01 09:36:01 -0800
committerGitHub <noreply@github.com>2021-02-01 09:36:01 -0800
commitbd370394048a63f58fb5f89ea6770a32cf2e99ea (patch)
treefa644afe5ced43ce69d3bdbd4775898be63135e8
parenta848caf8c68629354d5866b9f3d43f90794c1b65 (diff)
parent5cf451d6a7e2dc7ef4cb803bc523dca7c4eecad7 (diff)
downloadchef-bd370394048a63f58fb5f89ea6770a32cf2e99ea.tar.gz
Merge pull request #10956 from chef/ohai_bump
Signed-off-by: Tim Smith <tsmith@chef.io>
-rw-r--r--Gemfile.lock14
-rw-r--r--omnibus/Gemfile.lock49
2 files changed, 33 insertions, 30 deletions
diff --git a/Gemfile.lock b/Gemfile.lock
index 1dd5efb7a3..573c369b89 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,17 +1,17 @@
GIT
remote: https://github.com/chef/chefstyle.git
- revision: b5cb2d3e4bbcb77fb5c6ed3357e89c670d64682f
+ revision: 5eb0100dbba7ad54aefff7bab14aabb7ce7a393c
branch: master
specs:
- chefstyle (1.6.0)
- rubocop (= 1.8.1)
+ chefstyle (1.6.2)
+ rubocop (= 1.9.1)
GIT
remote: https://github.com/chef/ohai.git
- revision: 0b5a78c8cd641903e3179c0984f55467694f9663
+ revision: 065e10af8ab2a6bf3db6d9da0db099207454f7d6
branch: master
specs:
- ohai (17.0.10)
+ ohai (17.0.11)
chef-config (>= 12.8, < 18)
chef-utils (>= 16.0, < 18)
ffi (~> 1.9)
@@ -310,7 +310,7 @@ GEM
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.9.0)
rspec-support (3.9.4)
- rubocop (1.8.1)
+ rubocop (1.9.1)
parallel (~> 1.10)
parser (>= 3.0.0.0)
rainbow (>= 2.2.2, < 4.0)
@@ -370,7 +370,7 @@ GEM
unicode-display_width (1.7.0)
unicode_utils (1.4.0)
uuidtools (2.2.0)
- webmock (3.11.1)
+ webmock (3.11.2)
addressable (>= 2.3.6)
crack (>= 0.3.2)
hashdiff (>= 0.4.0, < 2.0.0)
diff --git a/omnibus/Gemfile.lock b/omnibus/Gemfile.lock
index 1c4757770d..b1ca4ce81d 100644
--- a/omnibus/Gemfile.lock
+++ b/omnibus/Gemfile.lock
@@ -1,9 +1,9 @@
GIT
remote: https://github.com/chef/omnibus
- revision: 65c593140db931e91a25ce6624d99a3248c7288e
+ revision: aeda0bb23bfe19b52fb50a410e67c2727a44dec4
branch: master
specs:
- omnibus (8.0.13)
+ omnibus (8.0.14)
aws-sdk-s3 (~> 1)
chef-cleanroom (~> 1.0)
chef-utils (>= 15.4)
@@ -32,7 +32,7 @@ GEM
artifactory (3.0.15)
awesome_print (1.8.0)
aws-eventstream (1.1.0)
- aws-partitions (1.419.0)
+ aws-partitions (1.422.0)
aws-sdk-core (3.111.2)
aws-eventstream (~> 1, >= 1.0.2)
aws-partitions (~> 1, >= 1.239.0)
@@ -64,12 +64,12 @@ GEM
solve (~> 4.0)
thor (>= 0.20)
builder (3.2.4)
- chef (16.9.29)
+ chef (16.9.32)
addressable
bcrypt_pbkdf (= 1.1.0.rc2)
bundler (>= 1.10)
- chef-config (= 16.9.29)
- chef-utils (= 16.9.29)
+ chef-config (= 16.9.32)
+ chef-utils (= 16.9.32)
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, < 3.0)
- chef (16.9.29-universal-mingw32)
+ chef (16.9.32-universal-mingw32)
addressable
bcrypt_pbkdf (= 1.1.0.rc2)
bundler (>= 1.10)
- chef-config (= 16.9.29)
- chef-utils (= 16.9.29)
+ chef-config (= 16.9.32)
+ chef-utils (= 16.9.32)
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.9.29)
+ chef-config (16.9.32)
addressable
- chef-utils (= 16.9.29)
+ chef-utils (= 16.9.32)
fuzzyurl
mixlib-config (>= 2.2.12, < 4.0)
mixlib-shellout (>= 2.0, < 4.0)
@@ -161,7 +161,7 @@ GEM
chef-config
concurrent-ruby (~> 1.0)
ffi-yajl (~> 2.2)
- chef-utils (16.9.29)
+ chef-utils (16.9.32)
chef-vault (4.1.0)
chef-zero (15.0.4)
ffi-yajl (~> 2.2)
@@ -183,6 +183,8 @@ GEM
multipart-post (>= 1.2, < 3)
ruby2_keywords
faraday-net_http (1.0.1)
+ faraday_middleware (1.0.0)
+ faraday (~> 1.0)
ffi (1.14.2)
ffi (1.14.2-x64-mingw32)
ffi (1.14.2-x86-mingw32)
@@ -201,17 +203,18 @@ GEM
highline (2.0.3)
httpclient (2.8.3)
iniparse (1.5.0)
- inspec-core (4.25.1)
+ inspec-core (4.26.4)
addressable (~> 2.4)
chef-telemetry (~> 1.0)
faraday (>= 0.9.0, < 1.4)
+ faraday_middleware (~> 1.0)
hashie (>= 3.4, < 5.0)
license-acceptance (>= 0.2.13, < 3.0)
method_source (>= 0.8, < 2.0)
mixlib-log (~> 3.0)
multipart-post (~> 2.0)
parallel (~> 1.9)
- parslet (>= 1.5, < 3.0)
+ parslet (>= 1.5, < 2.0)
pry (~> 0.13)
rspec (>= 3.9, < 3.11)
rspec-its (~> 1.2)
@@ -298,7 +301,7 @@ GEM
train-core
wmi-lite (~> 1.0)
parallel (1.20.1)
- parslet (2.0.0)
+ parslet (1.8.2)
pastel (0.8.0)
tty-color (~> 0.5)
pedump (0.6.1)
@@ -328,13 +331,13 @@ GEM
rspec-its (1.3.0)
rspec-core (>= 3.0.0)
rspec-expectations (>= 3.0.0)
- rspec-mocks (3.10.1)
+ rspec-mocks (3.10.2)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.10.0)
- rspec-support (3.10.1)
+ rspec-support (3.10.2)
ruby-progressbar (1.11.0)
ruby2_keywords (0.0.4)
- rubyntlm (0.6.2)
+ rubyntlm (0.6.3)
rubyzip (2.3.0)
sawyer (0.8.2)
addressable (>= 2.3.5)
@@ -368,15 +371,15 @@ GEM
toml-rb (2.0.1)
citrus (~> 3.0, > 3.0)
tomlrb (1.3.0)
- train-core (3.4.8)
+ train-core (3.4.9)
addressable (~> 2.5)
ffi (!= 1.13.0)
json (>= 1.8, < 3.0)
mixlib-shellout (>= 2.0, < 4.0)
net-scp (>= 1.2, < 4.0)
net-ssh (>= 2.9, < 7.0)
- train-winrm (0.2.11)
- winrm (~> 2.0)
+ train-winrm (0.2.12)
+ winrm (>= 2.3.6, < 3.0)
winrm-elevated (~> 1.2.2)
winrm-fs (~> 1.0)
tty-box (0.7.0)
@@ -423,7 +426,7 @@ GEM
win32-taskscheduler (2.0.4)
ffi
structured_warnings
- winrm (2.3.5)
+ winrm (2.3.6)
builder (>= 2.1.2)
erubi (~> 1.8)
gssapi (~> 1.2)
@@ -431,7 +434,7 @@ GEM
httpclient (~> 2.2, >= 2.2.0.2)
logging (>= 1.6.1, < 3.0)
nori (~> 2.0)
- rubyntlm (~> 0.6.0, >= 0.6.1)
+ rubyntlm (~> 0.6.0, >= 0.6.3)
winrm-elevated (1.2.3)
erubi (~> 1.8)
winrm (~> 2.0)