Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

upgrade to OpenSSL 1.0.2j #1436

Merged
merged 2 commits into from Sep 27, 2016
Merged

upgrade to OpenSSL 1.0.2j #1436

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b1e8544
upgrade to OpenSSL 1.0.2i
robbkidd Sep 22, 2016
185c3fb
upgrade to OpenSSL 1.0.2j
robbkidd Sep 26, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
19 changes: 10 additions & 9 deletions omnibus/Gemfile.lock
View file
Open in desktop
@@ -1,14 +1,14 @@
GIT
remote: https://github.com/chef/omnibus-software.git
revision: 8eeb0bb45b01b833389c662932c9fab9042f328b
revision: 778b2bb20cb3f64207ad822c1277e6068be5bbfc
specs:
omnibus-software (4.0.0)
chef-sugar (>= 3.4.0)
omnibus (>= 5.5.0)

GIT
remote: https://github.com/chef/omnibus.git
revision: 3eefb1cd8de69b1d97de2962f779512892e9296d
revision: ed8a050dc3df3fca242f068879cfc867762428d3
specs:
omnibus (5.5.0)
aws-sdk (~> 2)
Expand All @@ -27,12 +27,12 @@ GEM
specs:
addressable (2.4.0)
artifactory (2.3.3)
aws-sdk (2.5.11)
aws-sdk-resources (= 2.5.11)
aws-sdk-core (2.5.11)
aws-sdk (2.6.3)
aws-sdk-resources (= 2.6.3)
aws-sdk-core (2.6.3)
jmespath (~> 1.0)
aws-sdk-resources (2.5.11)
aws-sdk-core (= 2.5.11)
aws-sdk-resources (2.6.3)
aws-sdk-core (= 2.6.3)
berkshelf (4.3.5)
addressable (~> 2.3, >= 2.3.4)
berkshelf-api-client (~> 2.0, >= 2.0.2)
Expand Down Expand Up @@ -68,7 +68,8 @@ GEM
celluloid-io (0.16.2)
celluloid (>= 0.16.0)
nio4r (>= 1.1.0)
chef-config (12.13.37)
chef-config (12.14.89)
addressable
fuzzyurl
mixlib-config (~> 2.0)
mixlib-shellout (~> 2.0)
Expand All @@ -90,7 +91,7 @@ GEM
kitchen-vagrant (0.20.0)
test-kitchen (~> 1.4)
libyajl2 (1.2.0)
license_scout (0.1.2)
license_scout (0.1.3)
ffi-yajl (~> 2.2)
mixlib-shellout (~> 2.2)
minitar (0.5.4)
Expand Down
2 changes: 1 addition & 1 deletion omnibus/config/projects/supermarket.rb
View file
Open in desktop
Expand Up @@ -34,7 +34,7 @@
override :git, version: "2.2.1"
override :'chef-gem', version: '12.13.37'
override :redis, version: '2.8.21'
override :openssl, version: '1.0.2h'
override :openssl, version: '1.0.2j'

# pin berks to keep net-ssh at 2.9.2 as expected by Supermarket
# chef, net-ssh, berks and rspec have gotten tangled
Expand Down