summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarc A. Paradise <marc.paradise@gmail.com>2021-02-15 15:04:31 -0500
committerMarc A. Paradise <marc.paradise@gmail.com>2021-02-15 15:45:29 -0500
commitab12b167ffbbd07f3fabe4ac661c8adf9bef9fd5 (patch)
tree6b416ae79de1d09aebc62b6e751677dcf18532f5
parentabb4ef7b8c2c292aa7ce2768e6bc89486f2d0a43 (diff)
downloadchef-mp/openssl-lib-dir-fix-2.tar.gz
Signed-off-by: Marc A. Paradise <marc.paradise@gmail.com>
-rw-r--r--omnibus/Gemfile4
-rw-r--r--omnibus/Gemfile.lock16
2 files changed, 10 insertions, 10 deletions
diff --git a/omnibus/Gemfile b/omnibus/Gemfile
index df94943a3d..0ae3b20975 100644
--- a/omnibus/Gemfile
+++ b/omnibus/Gemfile
@@ -1,7 +1,7 @@
source "https://rubygems.org"
gem "omnibus", git: "https://github.com/chef/omnibus", branch: "master"
-gem "omnibus-software", git: "https://github.com/chef/omnibus-software", branch: "master"
+gem "omnibus-software", git: "https://github.com/chef/omnibus-software", branch: "mp/openssl-libdirs-again"
gem "artifactory"
gem "pedump"
@@ -21,4 +21,4 @@ group :development do
gem "test-kitchen", ">= 1.23"
gem "kitchen-vagrant", ">= 1.3.1"
gem "winrm-fs", "~> 1.0"
-end \ No newline at end of file
+end
diff --git a/omnibus/Gemfile.lock b/omnibus/Gemfile.lock
index 5201141e33..8d29d59fb9 100644
--- a/omnibus/Gemfile.lock
+++ b/omnibus/Gemfile.lock
@@ -1,9 +1,9 @@
GIT
remote: https://github.com/chef/omnibus
- revision: ce5edb7250a9fd82f7bbc79acfddc9e850fc35a7
+ revision: f939485b5c6281500e41d14a1bf21873474248b7
branch: master
specs:
- omnibus (8.0.15)
+ omnibus (8.0.16)
aws-sdk-s3 (~> 1)
chef-cleanroom (~> 1.0)
chef-utils (>= 15.4)
@@ -18,8 +18,8 @@ GIT
GIT
remote: https://github.com/chef/omnibus-software
- revision: ef9714fd7868c15cc34158aa5896b0ae4c9c2eac
- branch: master
+ revision: 185999398bb4f7922633252252846d77418545ec
+ branch: mp/openssl-libdirs-again
specs:
omnibus-software (4.0.0)
omnibus (>= 8.0.0)
@@ -32,7 +32,7 @@ GEM
artifactory (3.0.15)
awesome_print (1.8.0)
aws-eventstream (1.1.0)
- aws-partitions (1.426.0)
+ aws-partitions (1.427.0)
aws-sdk-core (3.112.0)
aws-eventstream (~> 1, >= 1.0.2)
aws-partitions (~> 1, >= 1.239.0)
@@ -41,7 +41,7 @@ GEM
aws-sdk-kms (1.42.0)
aws-sdk-core (~> 3, >= 3.112.0)
aws-sigv4 (~> 1.1)
- aws-sdk-s3 (1.88.0)
+ aws-sdk-s3 (1.88.1)
aws-sdk-core (~> 3, >= 3.112.0)
aws-sdk-kms (~> 1)
aws-sigv4 (~> 1.1)
@@ -262,9 +262,9 @@ GEM
mixlib-versioning
thor
mixlib-log (3.0.9)
- mixlib-shellout (3.2.2)
+ mixlib-shellout (3.2.5)
chef-utils
- mixlib-shellout (3.2.2-universal-mingw32)
+ mixlib-shellout (3.2.5-universal-mingw32)
chef-utils
ffi-win32-extensions (~> 1.0.3)
win32-process (~> 0.9)