diff options
author | Tim Smith <tsmith@chef.io> | 2017-12-07 12:29:51 -0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-12-07 12:29:51 -0800 |
commit | 0f0e1df4f772df8bc6882de8732d5decdd019cf1 (patch) | |
tree | 933f2f8228cbae1e2f888e7a22152fb3ee7353fe | |
parent | a479d6613efa480c67f20893a413f92970dbe50e (diff) | |
parent | 0afd9d52e244fd6066484335667400536eb75dfb (diff) | |
download | chef-0f0e1df4f772df8bc6882de8732d5decdd019cf1.tar.gz |
Merge pull request #6630 from chef/openssl
Update for openssl 1.0.2n and inspec 1.48
-rw-r--r-- | Gemfile.lock | 7 | ||||
-rw-r--r-- | omnibus/Gemfile.lock | 34 | ||||
-rw-r--r-- | omnibus_overrides.rb | 2 |
3 files changed, 21 insertions, 22 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index f7a6d8c978..8afef29fb0 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -162,7 +162,7 @@ GEM htmlentities (4.3.4) httpclient (2.8.3) iniparse (1.4.4) - inspec (1.47.0) + inspec (1.48.0) addressable (~> 2.4) faraday (>= 0.9.0) hashie (~> 3.4) @@ -173,7 +173,6 @@ GEM parallel (~> 1.9) parslet (~> 1.5) pry (~> 0) - rainbow (~> 2) rspec (~> 3) rspec-its (~> 1.2) rubyzip (~> 1.1) @@ -181,7 +180,7 @@ GEM sslshake (~> 1.2) thor (~> 0.19) tomlrb (~> 1.2) - train (~> 0.30) + train (~> 0.31, >= 0.31.1) ipaddress (0.8.3) iso8601 (0.9.1) json (2.1.0) @@ -319,7 +318,7 @@ GEM systemu (2.6.5) thor (0.20.0) tomlrb (1.2.6) - train (0.31.0) + train (0.31.1) docker-api (~> 1.26) json (>= 1.8, < 3.0) mixlib-shellout (~> 2.0) diff --git a/omnibus/Gemfile.lock b/omnibus/Gemfile.lock index 2365421c75..06ef842859 100644 --- a/omnibus/Gemfile.lock +++ b/omnibus/Gemfile.lock @@ -1,6 +1,6 @@ GIT remote: https://github.com/chef/license_scout - revision: 11f5c3d644be622eb367fe104750dca4f10ce1e5 + revision: d736df0d72f84ed3f0c8e3eb66b12562a3dccbda specs: license_scout (0.1.3) ffi-yajl (~> 2.2) @@ -9,7 +9,7 @@ GIT GIT remote: https://github.com/chef/omnibus - revision: e3807801e61b9012ea2e0677a60c2bf72c0e4972 + revision: f6f9973bd65af06a6b3077b3ee094ca203b1d612 specs: omnibus (5.6.1) aws-sdk (~> 2) @@ -26,7 +26,7 @@ GIT GIT remote: https://github.com/chef/omnibus-software - revision: 0f8723f83627b40dcf73052ac066baf8f643cce4 + revision: d6accc79f166cc6fc552e07088951bf467c30989 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.78) - aws-sdk-resources (= 2.10.78) - aws-sdk-core (2.10.78) + aws-sdk (2.10.99) + aws-sdk-resources (= 2.10.99) + aws-sdk-core (2.10.99) aws-sigv4 (~> 1.0) jmespath (~> 1.0) - aws-sdk-resources (2.10.78) - aws-sdk-core (= 2.10.78) + aws-sdk-resources (2.10.99) + aws-sdk-core (= 2.10.99) aws-sigv4 (1.0.2) berkshelf (4.3.5) addressable (~> 2.3, >= 2.3.4) @@ -85,7 +85,7 @@ GEM celluloid-io (0.16.2) celluloid (>= 0.16.0) nio4r (>= 1.1.0) - chef-config (13.6.0) + chef-config (13.6.4) addressable fuzzyurl mixlib-config (~> 2.0) @@ -152,7 +152,7 @@ GEM nori (2.6.0) octokit (4.7.0) sawyer (~> 0.8.0, >= 0.5.3) - ohai (8.25.0) + ohai (8.25.1) chef-config (>= 12.5.0.alpha.1, < 14) ffi (~> 1.9) ffi-yajl (~> 2.2) @@ -172,16 +172,16 @@ GEM zhexdump (>= 0.0.2) plist (3.3.0) progressbar (1.9.0) - pry (0.11.2) + pry (0.11.3) coderay (~> 1.1.0) method_source (~> 0.9.0) - pry-byebug (3.5.0) + pry-byebug (3.5.1) byebug (~> 9.1) pry (~> 0.10) pry-stack_explorer (0.4.9.2) binding_of_caller (>= 0.7) pry (>= 0.9.11) - public_suffix (3.0.0) + public_suffix (3.0.1) retryable (2.0.4) ridley (4.6.1) addressable @@ -213,7 +213,7 @@ GEM molinillo (~> 0.4.2) semverse (~> 1.1) systemu (2.6.5) - test-kitchen (1.19.0) + test-kitchen (1.19.2) mixlib-install (~> 3.6) mixlib-shellout (>= 1.2, < 3.0) net-scp (~> 1.1) @@ -223,11 +223,11 @@ GEM thor (~> 0.19, < 0.19.2) winrm (~> 2.0) winrm-elevated (~> 1.0) - winrm-fs (~> 1.0.2) + winrm-fs (~> 1.1.0) thor (0.19.1) timers (4.0.4) hitimes - toml-rb (1.1.0) + toml-rb (1.1.1) citrus (~> 3.0, > 3.0) varia_model (0.4.1) buff-extensions (~> 1.0) @@ -246,7 +246,7 @@ GEM winrm-elevated (1.1.0) winrm (~> 2.0) winrm-fs (~> 1.0) - winrm-fs (1.0.2) + winrm-fs (1.1.1) erubis (~> 2.7) logging (>= 1.6.1, < 3.0) rubyzip (~> 1.1) diff --git a/omnibus_overrides.rb b/omnibus_overrides.rb index a9b0bad56f..c88ebfdcc1 100644 --- a/omnibus_overrides.rb +++ b/omnibus_overrides.rb @@ -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.2m" +override "openssl", version: "1.0.2n" |