diff options
| author | Tim Smith <tsmith@chef.io> | 2018-03-27 09:00:44 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-03-27 09:00:44 -0700 |
| commit | 42e9ff89d630336e91504fbcb36f4d95f55a95a7 (patch) | |
| tree | d7a1b35a37ba6bd53b6b60c9df990024c7afc3d1 | |
| parent | 6544dd658b5783bd377364133fe0ed71e28b073b (diff) | |
| parent | fde17793aa32a475fd6bf4f89bbd04aac940b4d9 (diff) | |
| download | chef-42e9ff89d630336e91504fbcb36f4d95f55a95a7.tar.gz | |
Merge pull request #7075 from chef/openssl_102o
Update openssl to 1.0.2o
| -rw-r--r-- | Gemfile.lock | 10 | ||||
| -rw-r--r-- | omnibus/Gemfile.lock | 12 | ||||
| -rw-r--r-- | omnibus_overrides.rb | 2 |
3 files changed, 12 insertions, 12 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index b135b1a548..8ebf2de910 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -105,13 +105,13 @@ GEM mixlib-cli (~> 1.4) mixlib-shellout (~> 2.0) ast (2.4.0) - aws-sdk (2.11.21) - aws-sdk-resources (= 2.11.21) - aws-sdk-core (2.11.21) + aws-sdk (2.11.22) + aws-sdk-resources (= 2.11.22) + aws-sdk-core (2.11.22) aws-sigv4 (~> 1.0) jmespath (~> 1.0) - aws-sdk-resources (2.11.21) - aws-sdk-core (= 2.11.21) + aws-sdk-resources (2.11.22) + aws-sdk-core (= 2.11.22) aws-sigv4 (1.0.2) azure_mgmt_resources (0.16.0) ms_rest_azure (~> 0.10.0) diff --git a/omnibus/Gemfile.lock b/omnibus/Gemfile.lock index 3ffec313cc..446f5394a3 100644 --- a/omnibus/Gemfile.lock +++ b/omnibus/Gemfile.lock @@ -18,7 +18,7 @@ GIT GIT remote: https://github.com/chef/omnibus-software - revision: e97dc51025c6c8d70409f41ba1dec6d4cce6a176 + revision: 23282b98937a697f6c2009b2d22b5c5fdaf87c38 branch: master specs: omnibus-software (4.0.0) @@ -31,13 +31,13 @@ GEM addressable (2.5.2) public_suffix (>= 2.0.2, < 4.0) awesome_print (1.8.0) - aws-sdk (2.11.21) - aws-sdk-resources (= 2.11.21) - aws-sdk-core (2.11.21) + aws-sdk (2.11.22) + aws-sdk-resources (= 2.11.22) + aws-sdk-core (2.11.22) aws-sigv4 (~> 1.0) jmespath (~> 1.0) - aws-sdk-resources (2.11.21) - aws-sdk-core (= 2.11.21) + aws-sdk-resources (2.11.22) + aws-sdk-core (= 2.11.22) aws-sigv4 (1.0.2) berkshelf (4.3.5) addressable (~> 2.3, >= 2.3.4) diff --git a/omnibus_overrides.rb b/omnibus_overrides.rb index 66b17933d0..7498a97886 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.2n" +override "openssl", version: "1.0.2o" |