summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Smith <tsmith@chef.io>2021-02-19 07:08:57 -0800
committerGitHub <noreply@github.com>2021-02-19 07:08:57 -0800
commitea39fb2b1fc99c58e59341d2f3dfda38d5357149 (patch)
tree9d96b09e02d2e1858f526a6cd91651a3ef1a2218
parent5b27111c05730f1d6a8b1d91249d7f1ebfb641a0 (diff)
parenta53eef969edf999f1c529de6d9d92faa2118ce66 (diff)
downloadchef-ea39fb2b1fc99c58e59341d2f3dfda38d5357149.tar.gz
Merge pull request #11072 from MsysTechnologiesllc/dh/update_openssl_1.0.2y_to_chefv16
-rw-r--r--omnibus/Gemfile.lock2
-rw-r--r--omnibus_overrides.rb2
2 files changed, 2 insertions, 2 deletions
diff --git a/omnibus/Gemfile.lock b/omnibus/Gemfile.lock
index bc9775f143..28c3912e1c 100644
--- a/omnibus/Gemfile.lock
+++ b/omnibus/Gemfile.lock
@@ -18,7 +18,7 @@ GIT
GIT
remote: https://github.com/chef/omnibus-software
- revision: 1dd8635284fe12ad38473d74d04607e441d62ed4
+ revision: 9390767fa21b761855a960c10ca7c3d8c5704b5e
branch: master
specs:
omnibus-software (4.0.0)
diff --git a/omnibus_overrides.rb b/omnibus_overrides.rb
index 008614bdeb..73fa04faf7 100644
--- a/omnibus_overrides.rb
+++ b/omnibus_overrides.rb
@@ -14,7 +14,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.7.2"
override "ruby-windows-devkit-bash", version: "3.1.23-4-msys-1.0.18"