diff options
| author | Lamont Granquist <lamont@opscode.com> | 2021-02-22 10:16:45 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-02-22 10:16:45 -0800 |
| commit | 392785b4bc21c22a1ccbc44e00fe3ef924166f18 (patch) | |
| tree | d07690eed5e0dfef40e1d6ac46de798a998f0df0 | |
| parent | 22c38d869eb4ca59913875e76455ce3d62e7d56d (diff) | |
| parent | 4aa306769ba5fd4892e4f482d68fadd6275f7f28 (diff) | |
| download | chef-392785b4bc21c22a1ccbc44e00fe3ef924166f18.tar.gz | |
Merge pull request #11073 from MsysTechnologiesllc/dh/update_openssl_1.0.2y_to_chefv15
bump openssl-1.0.2y to chef-15
| -rw-r--r-- | omnibus/Gemfile.lock | 14 | ||||
| -rw-r--r-- | omnibus_overrides.rb | 2 |
2 files changed, 8 insertions, 8 deletions
diff --git a/omnibus/Gemfile.lock b/omnibus/Gemfile.lock index faa85a606c..0f80d55e50 100644 --- a/omnibus/Gemfile.lock +++ b/omnibus/Gemfile.lock @@ -1,9 +1,9 @@ GIT remote: https://github.com/chef/omnibus - revision: f939485b5c6281500e41d14a1bf21873474248b7 + revision: fb2a0058e37d4bede556d085714d54a5ded99f58 branch: master specs: - omnibus (8.0.16) + omnibus (8.1.1) aws-sdk-s3 (~> 1) chef-cleanroom (~> 1.0) chef-utils (>= 15.4) @@ -18,7 +18,7 @@ GIT GIT remote: https://github.com/chef/omnibus-software - revision: dd2a33e9b65365539c3226ed3438cb1bc4525964 + revision: 9390767fa21b761855a960c10ca7c3d8c5704b5e branch: master specs: omnibus-software (4.0.0) @@ -249,15 +249,15 @@ GEM multi_json (~> 1.14) method_source (1.0.0) minitar (0.9) - mixlib-archive (1.1.4) + mixlib-archive (1.1.7) mixlib-log - mixlib-archive (1.1.4-universal-mingw32) + mixlib-archive (1.1.7-universal-mingw32) mixlib-log mixlib-authentication (3.0.7) mixlib-cli (2.1.8) mixlib-config (3.0.9) tomlrb - mixlib-install (3.12.5) + mixlib-install (3.12.7) mixlib-shellout mixlib-versioning thor @@ -304,7 +304,7 @@ GEM parslet (1.8.2) pastel (0.8.0) tty-color (~> 0.5) - pedump (0.6.1) + pedump (0.6.2) awesome_print iostruct (>= 0.0.4) multipart-post (>= 2.0.0) diff --git a/omnibus_overrides.rb b/omnibus_overrides.rb index 6687edecf3..df290a9c8d 100644 --- a/omnibus_overrides.rb +++ b/omnibus_overrides.rb @@ -16,7 +16,7 @@ override "libyaml", version: "0.1.7" override "makedepend", version: "1.0.5" override "ncurses", version: "5.9" override "nokogiri", version: "1.11.0" -override "openssl", version: "1.0.2x" +override "openssl", version: "1.0.2y" override "pkg-config-lite", version: "0.28-1" override "ruby", version: "2.6.6" override "ruby-windows-devkit-bash", version: "3.1.23-4-msys-1.0.18" |