diff options
| author | Lamont Granquist <lamont@scriptkiddie.org> | 2017-11-06 12:23:29 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-11-06 12:23:29 -0800 |
| commit | 958b64e24f26fc3f49c661b4ad0acac6414d2c01 (patch) | |
| tree | 6603009038fa68bc4cecd249593cfec05e4b79a6 | |
| parent | 195d62a3c67a0a2d1e880d761ddb6fb4d07190ff (diff) | |
| parent | 8f7b07f64b17d97550fd43725fb9b357b3805864 (diff) | |
| download | chef-958b64e24f26fc3f49c661b4ad0acac6414d2c01.tar.gz | |
Merge pull request #6568 from chef/openssl_bump
Bump openssl and rubygems to latest
| -rw-r--r-- | omnibus/Gemfile.lock | 24 | ||||
| -rw-r--r-- | omnibus_overrides.rb | 4 |
2 files changed, 14 insertions, 14 deletions
diff --git a/omnibus/Gemfile.lock b/omnibus/Gemfile.lock index e9cdc4099e..2365421c75 100644 --- a/omnibus/Gemfile.lock +++ b/omnibus/Gemfile.lock @@ -1,6 +1,6 @@ GIT remote: https://github.com/chef/license_scout - revision: b7b1e6c5d027f201fc4fa30c775384112d81c1bd + revision: 11f5c3d644be622eb367fe104750dca4f10ce1e5 specs: license_scout (0.1.3) ffi-yajl (~> 2.2) @@ -26,7 +26,7 @@ GIT GIT remote: https://github.com/chef/omnibus-software - revision: 65a9bed9e37e0b6ba7c8aae0b588f11ce5fc399a + revision: 0f8723f83627b40dcf73052ac066baf8f643cce4 specs: omnibus-software (4.0.0) chef-sugar (>= 3.4.0) @@ -38,13 +38,13 @@ GEM addressable (2.5.2) public_suffix (>= 2.0.2, < 4.0) awesome_print (1.8.0) - aws-sdk (2.10.71) - aws-sdk-resources (= 2.10.71) - aws-sdk-core (2.10.71) + aws-sdk (2.10.78) + aws-sdk-resources (= 2.10.78) + aws-sdk-core (2.10.78) aws-sigv4 (~> 1.0) jmespath (~> 1.0) - aws-sdk-resources (2.10.71) - aws-sdk-core (= 2.10.71) + aws-sdk-resources (2.10.78) + aws-sdk-core (= 2.10.78) aws-sigv4 (1.0.2) berkshelf (4.3.5) addressable (~> 2.3, >= 2.3.4) @@ -85,12 +85,12 @@ GEM celluloid-io (0.16.2) celluloid (>= 0.16.0) nio4r (>= 1.1.0) - chef-config (13.5.3) + chef-config (13.6.0) addressable fuzzyurl mixlib-config (~> 2.0) mixlib-shellout (~> 2.0) - chef-sugar (3.5.0) + chef-sugar (3.6.0) citrus (3.0.2) cleanroom (1.0.0) coderay (1.1.2) @@ -130,7 +130,7 @@ GEM mixlib-authentication (1.4.2) mixlib-cli (1.7.0) mixlib-config (2.2.4) - mixlib-install (3.6.0) + mixlib-install (3.8.0) mixlib-shellout mixlib-versioning thor @@ -213,7 +213,7 @@ GEM molinillo (~> 0.4.2) semverse (~> 1.1) systemu (2.6.5) - test-kitchen (1.18.0) + test-kitchen (1.19.0) mixlib-install (~> 3.6) mixlib-shellout (>= 1.2, < 3.0) net-scp (~> 1.1) @@ -273,4 +273,4 @@ DEPENDENCIES winrm-fs (~> 1.0) BUNDLED WITH - 1.15.4 + 1.16.0 diff --git a/omnibus_overrides.rb b/omnibus_overrides.rb index 344277f607..a9b0bad56f 100644 --- a/omnibus_overrides.rb +++ b/omnibus_overrides.rb @@ -1,7 +1,7 @@ # THIS IS NOW HAND MANAGED, JUST EDIT THE THING # .travis.yml and appveyor.yml consume this, # try to keep it machine-parsable. -override :rubygems, version: "2.6.13" +override :rubygems, version: "2.6.14" override :bundler, version: "1.15.4" override "nokogiri", version: "1.8.1" override "libffi", version: "3.2.1" @@ -19,4 +19,4 @@ override "ruby-windows-devkit-bash", version: "3.1.23-4-msys-1.0.18" override "util-macros", version: "1.19.0" override "xproto", version: "7.0.28" override "zlib", version: "1.2.11" -override "openssl", version: "1.0.2l" +override "openssl", version: "1.0.2m" |