summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Smith <tsmith@chef.io>2020-04-21 15:28:54 -0700
committerGitHub <noreply@github.com>2020-04-21 15:28:54 -0700
commit593958274c274e97dae976c85403555935a82aa9 (patch)
tree0de842a3b40fddfa4a2dfb59671b37122cd12762
parentd0481fe73afe5b60b48cab25ae8a73bc74b187a5 (diff)
parent440d89bf6ac4e25738c30db605b84151cea11902 (diff)
downloadchef-593958274c274e97dae976c85403555935a82aa9.tar.gz
Merge pull request #9707 from chef/ohai_159
Update Ohai to 15.9
-rw-r--r--Gemfile.lock14
-rw-r--r--omnibus/Gemfile.lock4
2 files changed, 9 insertions, 9 deletions
diff --git a/Gemfile.lock b/Gemfile.lock
index c0b15374c6..fac6123fdd 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,17 +1,17 @@
GIT
remote: https://github.com/chef/chefstyle.git
- revision: d0e353d4415834d58aa267f8bc6d5c4ce8d95652
+ revision: 274a01b0e3fc9a350962c3ea73005e2a0d3215f2
branch: master
specs:
- chefstyle (1.0.0)
- rubocop (= 0.81.0)
+ chefstyle (1.0.3)
+ rubocop (= 0.82.0)
GIT
remote: https://github.com/chef/ohai.git
- revision: 1516a849f22c4248c8bccbf7b979e966d401d294
+ revision: 2bd01b7869ee04accb358350e1e3563eff9100b3
branch: 15-stable
specs:
- ohai (15.8.0)
+ ohai (15.9.1)
chef-config (>= 12.8, < 16)
ffi (~> 1.9)
ffi-yajl (~> 2.2)
@@ -141,7 +141,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)
@@ -327,7 +327,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 00415e3e40..a9223f0602 100644
--- a/omnibus/Gemfile.lock
+++ b/omnibus/Gemfile.lock
@@ -32,7 +32,7 @@ GEM
artifactory (3.0.12)
awesome_print (1.8.0)
aws-eventstream (1.1.0)
- aws-partitions (1.299.0)
+ aws-partitions (1.300.0)
aws-sdk-core (3.94.0)
aws-eventstream (~> 1, >= 1.0.2)
aws-partitions (~> 1, >= 1.239.0)
@@ -242,7 +242,7 @@ GEM
octokit (4.18.0)
faraday (>= 0.9)
sawyer (~> 0.8.0, >= 0.5.3)
- ohai (15.8.0)
+ ohai (15.9.1)
chef-config (>= 12.8, < 16)
ffi (~> 1.9)
ffi-yajl (~> 2.2)