summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRyan Hass <rhass@users.noreply.github.com>2018-05-29 14:44:56 -0700
committerRyan Hass <rhass@users.noreply.github.com>2018-05-31 17:12:33 -0700
commitc6000c853f89eb380631658c9c7ca091016014c5 (patch)
tree15cac1cfd0efb5def7c2d93380bda721eb441ab6
parenta3ced2c6b92d842ea93515337e575fd1f18dad17 (diff)
downloadchef-rhass/test-openssl-nocomp-branch.tar.gz
Pin omnibus-software branch for testing changes.rhass/test-openssl-nocomp-branch
Signed-off-by: Ryan Hass <rhass@users.noreply.github.com>
-rw-r--r--omnibus/Gemfile2
-rw-r--r--omnibus/Gemfile.lock34
2 files changed, 18 insertions, 18 deletions
diff --git a/omnibus/Gemfile b/omnibus/Gemfile
index 5457f0f40b..de93ab54f2 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: "rhass/update-openssl-and-cacerts"
gem "pedump"
diff --git a/omnibus/Gemfile.lock b/omnibus/Gemfile.lock
index 1b241b0ed7..fd7087f579 100644
--- a/omnibus/Gemfile.lock
+++ b/omnibus/Gemfile.lock
@@ -18,8 +18,8 @@ GIT
GIT
remote: https://github.com/chef/omnibus-software
- revision: 0cb3a8dfb6cebd56684c1d4609a676959389e4c5
- branch: master
+ revision: c535cab2727f9495bc979396f766bff0d89d49dd
+ branch: rhass/update-openssl-and-cacerts
specs:
omnibus-software (4.0.0)
chef-sugar (>= 3.4.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.33)
- aws-sdk-resources (= 2.11.33)
- aws-sdk-core (2.11.33)
+ aws-sdk (2.11.58)
+ aws-sdk-resources (= 2.11.58)
+ aws-sdk-core (2.11.58)
aws-sigv4 (~> 1.0)
jmespath (~> 1.0)
- aws-sdk-resources (2.11.33)
- aws-sdk-core (= 2.11.33)
+ aws-sdk-resources (2.11.58)
+ aws-sdk-core (= 2.11.58)
aws-sigv4 (1.0.2)
berkshelf (4.3.5)
addressable (~> 2.3, >= 2.3.4)
@@ -78,7 +78,7 @@ GEM
celluloid-io (0.16.2)
celluloid (>= 0.16.0)
nio4r (>= 1.1.0)
- chef-config (13.8.5)
+ chef-config (13.9.1)
addressable
fuzzyurl
mixlib-config (~> 2.0)
@@ -110,10 +110,10 @@ GEM
ipaddress (0.8.3)
jmespath (1.4.0)
json (2.1.0)
- kitchen-vagrant (1.3.1)
+ kitchen-vagrant (1.3.2)
test-kitchen (~> 1.4)
libyajl2 (1.2.0)
- license_scout (1.0.2)
+ license_scout (1.0.8)
ffi-yajl (~> 2.2)
mixlib-shellout (~> 2.2)
toml-rb (~> 1.0)
@@ -123,13 +123,13 @@ GEM
multi_json (~> 1.10)
method_source (0.9.0)
minitar (0.6.1)
- mixlib-archive (0.4.1)
+ mixlib-archive (0.4.6)
mixlib-log
mixlib-authentication (2.0.0)
mixlib-cli (1.7.0)
mixlib-config (2.2.6)
tomlrb
- mixlib-install (3.9.3)
+ mixlib-install (3.10.0)
mixlib-shellout
mixlib-versioning
thor
@@ -147,9 +147,9 @@ GEM
net-ssh (4.2.0)
net-ssh-gateway (1.3.0)
net-ssh (>= 2.6.5)
- nio4r (2.3.0)
+ nio4r (2.3.1)
nori (2.6.0)
- octokit (4.8.0)
+ octokit (4.9.0)
sawyer (~> 0.8.0, >= 0.5.3)
ohai (13.9.0)
chef-config (>= 12.5.0.alpha.1, < 14)
@@ -211,17 +211,17 @@ GEM
molinillo (~> 0.4.2)
semverse (~> 1.1)
systemu (2.6.5)
- test-kitchen (1.21.0)
+ test-kitchen (1.21.2)
mixlib-install (~> 3.6)
mixlib-shellout (>= 1.2, < 3.0)
net-scp (~> 1.1)
net-ssh (>= 2.9, < 5.0)
net-ssh-gateway (~> 1.2)
- thor (~> 0.19, < 0.19.2)
+ thor (~> 0.19)
winrm (~> 2.0)
winrm-elevated (~> 1.0)
winrm-fs (~> 1.1)
- thor (0.19.1)
+ thor (0.20.0)
timers (4.0.4)
hitimes
toml-rb (1.1.1)