diff options
| author | Tim Smith <tsmith@chef.io> | 2020-04-22 11:27:00 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-22 11:27:00 -0700 |
| commit | 188405f369c62d15dfed539e8b99af61073451ab (patch) | |
| tree | 8d73d05c4ace8b7f7fcba09d040a2095c4dd3dd5 | |
| parent | c1b866923f57eef1091af7efdc51fefd2a7194cc (diff) | |
| parent | 24175f6f44b77591453f0b985bc0c1f26a4878e3 (diff) | |
| download | chef-188405f369c62d15dfed539e8b99af61073451ab.tar.gz | |
Merge pull request #9713 from chef/omnibus_update
Update our omnibus software def to fix bundler on windows
| -rw-r--r-- | omnibus/Gemfile.lock | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/omnibus/Gemfile.lock b/omnibus/Gemfile.lock index eb0e63b3b7..b8ac130c6b 100644 --- a/omnibus/Gemfile.lock +++ b/omnibus/Gemfile.lock @@ -18,7 +18,7 @@ GIT GIT remote: https://github.com/chef/omnibus-software - revision: 111d0715a9a4cbd8771952d34014cbb0f7e060e2 + revision: bd098fc1798d7c988ff091f49aa27f1d06edfe80 branch: master specs: omnibus-software (4.0.0) @@ -64,12 +64,12 @@ GEM solve (~> 4.0) thor (>= 0.20) builder (3.2.4) - chef (15.9.17) + chef (15.10.12) addressable bcrypt_pbkdf (~> 1.0) bundler (>= 1.10) - chef-config (= 15.9.17) - chef-utils (= 15.9.17) + chef-config (= 15.10.12) + chef-utils (= 15.10.12) chef-zero (>= 14.0.11) diff-lcs (~> 1.2, >= 1.2.4) ed25519 (~> 1.2) @@ -92,16 +92,16 @@ GEM plist (~> 3.2) proxifier (~> 1.0) syslog-logger (~> 1.6) - train-core (~> 3.1) + train-core (~> 3.2, >= 3.2.28) train-winrm (>= 0.2.5) tty-screen (~> 0.6) uuidtools (~> 2.1.5) - chef (15.9.17-universal-mingw32) + chef (15.10.12-universal-mingw32) addressable bcrypt_pbkdf (~> 1.0) bundler (>= 1.10) - chef-config (= 15.9.17) - chef-utils (= 15.9.17) + chef-config (= 15.10.12) + chef-utils (= 15.10.12) chef-zero (>= 14.0.11) diff-lcs (~> 1.2, >= 1.2.4) ed25519 (~> 1.2) @@ -125,7 +125,7 @@ GEM plist (~> 3.2) proxifier (~> 1.0) syslog-logger (~> 1.6) - train-core (~> 3.1) + train-core (~> 3.2, >= 3.2.28) train-winrm (>= 0.2.5) tty-screen (~> 0.6) uuidtools (~> 2.1.5) @@ -141,15 +141,15 @@ GEM win32-taskscheduler (~> 2.0) wmi-lite (~> 1.0) chef-cleanroom (1.0.2) - chef-config (15.9.17) + chef-config (15.10.12) addressable - chef-utils (= 15.9.17) + chef-utils (= 15.10.12) fuzzyurl mixlib-config (>= 2.2.12, < 4.0) mixlib-shellout (>= 2.0, < 4.0) tomlrb (~> 1.2) chef-sugar (5.1.9) - chef-utils (15.9.17) + chef-utils (15.10.12) chef-zero (15.0.0) ffi-yajl (~> 2.2) hashie (>= 2.0, < 5.0) |