diff options
| author | Tim Smith <tsmith@chef.io> | 2020-08-19 10:01:08 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-08-19 10:01:08 -0700 |
| commit | bd40569f4c4899be0515a1815c84f6a114874c57 (patch) | |
| tree | 96edcb9c82e65a0845b02f3bd29b63e4997496e7 | |
| parent | ae99fcc552b0385be0ec70ee38632a67428c1e29 (diff) | |
| parent | e1204535ad8c301622dfd0064a20a4e518ee6ef0 (diff) | |
| download | chef-bd40569f4c4899be0515a1815c84f6a114874c57.tar.gz | |
Merge pull request #10327 from chef/update_ohai
Update Ohai to 16.4.11 to resolve Windows IP detection
| -rw-r--r-- | Gemfile.lock | 4 | ||||
| -rw-r--r-- | omnibus/Gemfile.lock | 25 |
2 files changed, 13 insertions, 16 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 98428281d6..bf261f05c0 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -8,10 +8,10 @@ GIT GIT remote: https://github.com/chef/ohai.git - revision: a61bba8887723c7c7dc7e0211a31af9dc6e84b2b + revision: 66d31133c14ab890ac57ec411d657824934661ef branch: master specs: - ohai (16.4.11) + ohai (16.4.12) chef-config (>= 12.8, < 17) chef-utils (>= 16.0, < 17) ffi (~> 1.9) diff --git a/omnibus/Gemfile.lock b/omnibus/Gemfile.lock index 4872443105..21679226ee 100644 --- a/omnibus/Gemfile.lock +++ b/omnibus/Gemfile.lock @@ -32,7 +32,7 @@ GEM artifactory (3.0.15) awesome_print (1.8.0) aws-eventstream (1.1.0) - aws-partitions (1.356.0) + aws-partitions (1.357.0) aws-sdk-core (3.104.3) 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.3.45) + chef (16.4.38) addressable bcrypt_pbkdf (= 1.1.0.rc1) bundler (>= 1.10) - chef-config (= 16.3.45) - chef-utils (= 16.3.45) + chef-config (= 16.4.38) + chef-utils (= 16.4.38) chef-vault chef-zero (>= 14.0.11) diff-lcs (>= 1.2.4, < 1.4.0) @@ -99,12 +99,12 @@ GEM tty-prompt (~> 0.21) tty-screen (~> 0.6) uuidtools (~> 2.1.5) - chef (16.3.45-universal-mingw32) + chef (16.4.38-universal-mingw32) addressable bcrypt_pbkdf (= 1.1.0.rc1) bundler (>= 1.10) - chef-config (= 16.3.45) - chef-utils (= 16.3.45) + chef-config (= 16.4.38) + chef-utils (= 16.4.38) chef-vault chef-zero (>= 14.0.11) diff-lcs (>= 1.2.4, < 1.4.0) @@ -137,7 +137,6 @@ GEM uuidtools (~> 2.1.5) win32-api (~> 1.5.3) win32-certstore (~> 0.3) - win32-dir (~> 0.5.0) win32-event (~> 0.6.1) win32-eventlog (= 0.6.3) win32-mmap (~> 0.4.1) @@ -147,15 +146,15 @@ GEM win32-taskscheduler (~> 2.0) wmi-lite (~> 1.0) chef-cleanroom (1.0.2) - chef-config (16.3.45) + chef-config (16.4.38) addressable - chef-utils (= 16.3.45) + chef-utils (= 16.4.38) fuzzyurl mixlib-config (>= 2.2.12, < 4.0) mixlib-shellout (>= 2.0, < 4.0) tomlrb (~> 1.2) chef-sugar (5.1.11) - chef-utils (16.3.45) + chef-utils (16.4.38) chef-vault (4.0.6) chef-zero (15.0.1) ffi-yajl (~> 2.2) @@ -282,7 +281,7 @@ GEM addressable (>= 2.3.5) faraday (> 0.8, < 2.0) semverse (3.0.0) - solve (4.0.3) + solve (4.0.4) molinillo (~> 0.6) semverse (>= 1.1, < 4.0) strings (0.2.0) @@ -340,8 +339,6 @@ GEM win32-certstore (0.4.0) ffi mixlib-shellout - win32-dir (0.5.1) - ffi (>= 1.0.0) win32-event (0.6.3) win32-ipc (>= 0.6.0) win32-eventlog (0.6.3) |