summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Smith <tsmith@chef.io>2020-04-17 13:11:16 -0700
committerGitHub <noreply@github.com>2020-04-17 13:11:16 -0700
commitd1c869b3e980e4f2fb08ce2e5c16beddc75ee83d (patch)
treeda3ad696a07bc8aa8852fe80c74931b4a3f54d95
parentd657a69f13d97f2ae89f39b6632f576b13822c7d (diff)
parent7cc59f602773bd423e66b81bbe1f34c2e1f7308f (diff)
downloadchef-d1c869b3e980e4f2fb08ce2e5c16beddc75ee83d.tar.gz
Merge pull request #9687 from chef/bump_ohai
Update Ohai to 16.0.18 for Windows DMI plugin
-rw-r--r--Gemfile.lock18
-rw-r--r--omnibus/Gemfile.lock10
2 files changed, 14 insertions, 14 deletions
diff --git a/Gemfile.lock b/Gemfile.lock
index df423e8b5e..255c8e6be6 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,17 +1,17 @@
GIT
remote: https://github.com/chef/chefstyle.git
- revision: d0e353d4415834d58aa267f8bc6d5c4ce8d95652
+ revision: a2df4abd292052dfc822da3d34ff737c0c3d87b0
branch: master
specs:
- chefstyle (1.0.0)
- rubocop (= 0.81.0)
+ chefstyle (1.0.1)
+ rubocop (= 0.82.0)
GIT
remote: https://github.com/chef/ohai.git
- revision: 471ac97407eaf5570da0a25fcec227f727ea5439
+ revision: cd6090f256fcadf23c10235ece5e976cdd7c6084
branch: master
specs:
- ohai (16.0.17)
+ ohai (16.0.18)
chef-config (>= 12.8, < 17)
ffi (~> 1.9)
ffi-yajl (~> 2.2)
@@ -145,7 +145,7 @@ GEM
binding_of_caller (0.8.0)
debug_inspector (>= 0.0.1)
builder (3.2.4)
- byebug (11.1.1)
+ byebug (11.1.2)
chef-telemetry (1.0.3)
chef-config
concurrent-ruby (~> 1.0)
@@ -247,7 +247,7 @@ GEM
regexp_parser (~> 1.5)
uri_template (~> 0.7)
libyajl2 (1.2.0)
- license-acceptance (1.0.18)
+ license-acceptance (1.0.19)
pastel (~> 0.7)
tomlrb (~> 1.2)
tty-box (~> 0.3)
@@ -285,7 +285,7 @@ GEM
net-ssh-gateway (>= 1.2.0)
nori (2.6.0)
parallel (1.19.1)
- parser (2.7.1.0)
+ parser (2.7.1.1)
ast (~> 2.4.0)
parslet (1.8.2)
pastel (0.7.3)
@@ -331,7 +331,7 @@ GEM
rspec_junit_formatter (0.2.3)
builder (< 4)
rspec-core (>= 2, < 4, != 2.12.0)
- rubocop (0.81.0)
+ rubocop (0.82.0)
jaro_winkler (~> 1.5.1)
parallel (~> 1.10)
parser (>= 2.7.0.1)
diff --git a/omnibus/Gemfile.lock b/omnibus/Gemfile.lock
index f8f4d31ed6..44ad6fea49 100644
--- a/omnibus/Gemfile.lock
+++ b/omnibus/Gemfile.lock
@@ -1,9 +1,9 @@
GIT
remote: https://github.com/chef/omnibus
- revision: f389917504c20839ff9607df63fb2e59e2c31b52
+ revision: fb089c39c178da353d1d89a1f4bd79b6cbb78b77
branch: master
specs:
- omnibus (7.0.7)
+ omnibus (7.0.9)
aws-sdk-s3 (~> 1)
chef-cleanroom (~> 1.0)
chef-sugar (>= 3.3)
@@ -18,7 +18,7 @@ GIT
GIT
remote: https://github.com/chef/omnibus-software
- revision: 18564cc92b5f7b6d3ada694a41adf3bf948918fb
+ revision: 1b490aa4e6a5b224d98d07d72cdf90cb2f132576
branch: master
specs:
omnibus-software (4.0.0)
@@ -32,7 +32,7 @@ GEM
artifactory (3.0.12)
awesome_print (1.8.0)
aws-eventstream (1.1.0)
- aws-partitions (1.296.0)
+ aws-partitions (1.297.0)
aws-sdk-core (3.94.0)
aws-eventstream (~> 1, >= 1.0.2)
aws-partitions (~> 1, >= 1.239.0)
@@ -192,7 +192,7 @@ GEM
kitchen-vagrant (1.6.1)
test-kitchen (>= 1.4, < 3)
libyajl2 (1.2.0)
- license-acceptance (1.0.18)
+ license-acceptance (1.0.19)
pastel (~> 0.7)
tomlrb (~> 1.2)
tty-box (~> 0.3)