diff options
| author | Tim Smith <tsmith@chef.io> | 2020-01-21 14:35:04 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-01-21 14:35:04 -0800 |
| commit | a9fccba06fcd78dfe1e34b21341cf475a6c0caf7 (patch) | |
| tree | b691140f27158585edf60b507303b9c69257cf05 | |
| parent | 4a7085af7b4c20a84f7c1ab15749e6b029a742b1 (diff) | |
| parent | 1f3cae75eed328e23b50e83f6547ef05ca1208d5 (diff) | |
| download | chef-a9fccba06fcd78dfe1e34b21341cf475a6c0caf7.tar.gz | |
Merge pull request #9249 from chef/new_ohai
Update Ohai to 15.7.4
| -rw-r--r-- | .expeditor/config.yml | 2 | ||||
| -rw-r--r-- | Gemfile.lock | 12 | ||||
| -rw-r--r-- | omnibus/Gemfile.lock | 4 |
3 files changed, 9 insertions, 9 deletions
diff --git a/.expeditor/config.yml b/.expeditor/config.yml index db810bf08e..4658fd956d 100644 --- a/.expeditor/config.yml +++ b/.expeditor/config.yml @@ -67,7 +67,7 @@ github: version_constraint: 14* changelog: - rollup_header: Changes not yet released to stable + rollup_header: Changes not yet released to stable channel # These actions are taken, in order they are specified, anytime a Pull Request is merged. merge_actions: diff --git a/Gemfile.lock b/Gemfile.lock index 21c98028bb..9b90e2804a 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -8,10 +8,10 @@ GIT GIT remote: https://github.com/chef/ohai.git - revision: 9cd1a980192a2b64111dc43cbca6470a6e7f1b44 + revision: ac9373514d319bfe724dc89d9a5493d3587f2111 branch: 15-stable specs: - ohai (15.7.3) + ohai (15.7.4) 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.0.1) + byebug (11.1.0) chef-telemetry (1.0.2) chef-config concurrent-ruby (~> 1.0) @@ -176,9 +176,9 @@ GEM faraday (>= 0.7.4, < 1.0) fauxhai-ng (7.5.1) net-ssh - ffi (1.11.3) - ffi (1.11.3-x64-mingw32) - ffi (1.11.3-x86-mingw32) + ffi (1.12.1) + ffi (1.12.1-x64-mingw32) + ffi (1.12.1-x86-mingw32) ffi-libarchive (1.0.0) ffi (~> 1.0) ffi-win32-extensions (1.0.3) diff --git a/omnibus/Gemfile.lock b/omnibus/Gemfile.lock index cc2cea1887..5fa49b8996 100644 --- a/omnibus/Gemfile.lock +++ b/omnibus/Gemfile.lock @@ -32,13 +32,13 @@ GEM artifactory (3.0.12) awesome_print (1.8.0) aws-eventstream (1.0.3) - aws-partitions (1.266.0) + aws-partitions (1.267.0) aws-sdk-core (3.89.1) aws-eventstream (~> 1.0, >= 1.0.2) aws-partitions (~> 1, >= 1.239.0) aws-sigv4 (~> 1.1) jmespath (~> 1.0) - aws-sdk-kms (1.27.0) + aws-sdk-kms (1.28.0) aws-sdk-core (~> 3, >= 3.71.0) aws-sigv4 (~> 1.1) aws-sdk-s3 (1.60.1) |