diff options
| author | Tim Smith <tsmith@chef.io> | 2019-01-22 10:59:06 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-01-22 10:59:06 -0800 |
| commit | da84a7df64466386ea653f590c11da8db1231f04 (patch) | |
| tree | 5078a3d1a99e88853178b915af69bc00a8276882 | |
| parent | 0aeb17663dcae33cb5c870524b7bd5c11622f7db (diff) | |
| parent | 31d4c57a38c038a28396e2ce53849e5bbc7cda69 (diff) | |
| download | chef-da84a7df64466386ea653f590c11da8db1231f04.tar.gz | |
Merge pull request #8146 from chef/more_omnibus
Update omnibus Chef dep to 14.8
| -rw-r--r-- | Gemfile.lock | 2 | ||||
| -rw-r--r-- | omnibus/Gemfile.lock | 28 |
2 files changed, 17 insertions, 13 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index c11f17155c..fb776691c1 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -370,7 +370,7 @@ GEM rubyzip (~> 1.1) winrm (~> 2.0) wmi-lite (1.0.2) - yard (0.9.16) + yard (0.9.18) PLATFORMS ruby diff --git a/omnibus/Gemfile.lock b/omnibus/Gemfile.lock index 41f612160d..6e8fdb0848 100644 --- a/omnibus/Gemfile.lock +++ b/omnibus/Gemfile.lock @@ -63,10 +63,10 @@ GEM debug_inspector (>= 0.0.1) builder (3.2.3) byebug (10.0.2) - chef (14.6.47) + chef (14.8.12) addressable bundler (>= 1.10) - chef-config (= 14.6.47) + chef-config (= 14.8.12) chef-zero (>= 13.0) diff-lcs (~> 1.2, >= 1.2.4) erubis (~> 2.7) @@ -93,10 +93,10 @@ GEM specinfra (~> 2.10) syslog-logger (~> 1.6) uuidtools (~> 2.1.5) - chef (14.6.47-universal-mingw32) + chef (14.8.12-universal-mingw32) addressable bundler (>= 1.10) - chef-config (= 14.6.47) + chef-config (= 14.8.12) chef-zero (>= 13.0) diff-lcs (~> 1.2, >= 1.2.4) erubis (~> 2.7) @@ -125,6 +125,7 @@ GEM syslog-logger (~> 1.6) uuidtools (~> 2.1.5) win32-api (~> 1.5.3) + win32-certstore (>= 0.1.8) win32-dir (~> 0.5.0) win32-event (~> 0.6.1) win32-eventlog (= 0.6.3) @@ -135,7 +136,7 @@ GEM win32-taskscheduler (~> 2.0) windows-api (~> 0.4.4) wmi-lite (~> 1.0) - chef-config (14.6.47) + chef-config (14.8.12) addressable fuzzyurl mixlib-config (>= 2.2.12, < 3.0) @@ -146,20 +147,20 @@ GEM ffi-yajl (~> 2.2) hashie (>= 2.0, < 4.0) mixlib-log (~> 2.0) - rack (~> 2.0) + rack (~> 2.0, >= 2.0.6) uuidtools (~> 2.1) citrus (3.0.2) cleanroom (1.0.0) coderay (1.1.2) - concurrent-ruby (1.0.5) + concurrent-ruby (1.1.4) debug_inspector (0.0.3) diff-lcs (1.3) erubis (2.7.0) - faraday (0.15.3) + faraday (0.15.4) multipart-post (>= 1.2, < 3) - ffi (1.9.25) - ffi (1.9.25-x64-mingw32) - ffi (1.9.25-x86-mingw32) + ffi (1.10.0) + ffi (1.10.0-x64-mingw32) + ffi (1.10.0-x86-mingw32) ffi-win32-extensions (1.0.3) ffi ffi-yajl (2.3.1) @@ -225,7 +226,7 @@ GEM nori (2.6.0) octokit (4.13.0) sawyer (~> 0.8.0, >= 0.5.3) - ohai (14.6.2) + ohai (14.8.10) chef-config (>= 12.8, < 15) ffi (~> 1.9) ffi-yajl (~> 2.2) @@ -317,6 +318,9 @@ GEM tomlrb (1.2.8) uuidtools (2.1.5) win32-api (1.5.3-universal-mingw32) + win32-certstore (0.2.2) + ffi + mixlib-shellout win32-dir (0.5.1) ffi (>= 1.0.0) win32-event (0.6.3) |