summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThom May <thom@chef.io>2017-06-16 11:52:05 +0100
committerThom May <thom@chef.io>2017-06-16 11:52:05 +0100
commit5045b380c97425345a6f01a117ab86ebafa4d1de (patch)
treef22577763f9097bb0d8dfac772949417d8b2c62d
parent14f693ba740decd876e67dbcb9f5d525ebbfdd8a (diff)
downloadchef-5045b380c97425345a6f01a117ab86ebafa4d1de.tar.gz
bump zlib to 1.2.11tm/zlib
Signed-off-by: Thom May <thom@chef.io>
-rw-r--r--omnibus/Gemfile.lock20
-rw-r--r--omnibus_overrides.rb2
2 files changed, 11 insertions, 11 deletions
diff --git a/omnibus/Gemfile.lock b/omnibus/Gemfile.lock
index dba62c2170..3d69a37465 100644
--- a/omnibus/Gemfile.lock
+++ b/omnibus/Gemfile.lock
@@ -1,6 +1,6 @@
GIT
remote: https://github.com/chef/license_scout
- revision: 4f781af91c03e40db797c104a65612690a567d2d
+ revision: e9c48c6773dec6fd718642194bfcb166d5685e03
specs:
license_scout (0.1.3)
ffi-yajl (~> 2.2)
@@ -8,7 +8,7 @@ GIT
GIT
remote: https://github.com/chef/omnibus
- revision: ad5d3f983c87931904dbfaec9f6c09de1027330f
+ revision: 0212438d74eb408791724d737afba83868e416ed
specs:
omnibus (5.5.0)
aws-sdk (~> 2)
@@ -25,7 +25,7 @@ GIT
GIT
remote: https://github.com/chef/omnibus-software
- revision: dff477bf41d361fdec34e3dd464f8bbfb7f219e4
+ revision: 266a8ab07b0380607ce8a6ec5fd824ea002be2f1
specs:
omnibus-software (4.0.0)
chef-sugar (>= 3.4.0)
@@ -36,15 +36,15 @@ GEM
specs:
addressable (2.5.1)
public_suffix (~> 2.0, >= 2.0.2)
- artifactory (2.8.1)
+ artifactory (2.8.2)
awesome_print (1.7.0)
- aws-sdk (2.9.25)
- aws-sdk-resources (= 2.9.25)
- aws-sdk-core (2.9.25)
+ aws-sdk (2.9.41)
+ aws-sdk-resources (= 2.9.41)
+ aws-sdk-core (2.9.41)
aws-sigv4 (~> 1.0)
jmespath (~> 1.0)
- aws-sdk-resources (2.9.25)
- aws-sdk-core (= 2.9.25)
+ aws-sdk-resources (2.9.41)
+ aws-sdk-core (= 2.9.41)
aws-sigv4 (1.0.0)
berkshelf (4.3.5)
addressable (~> 2.3, >= 2.3.4)
@@ -268,4 +268,4 @@ DEPENDENCIES
winrm-fs (~> 1.0)
BUNDLED WITH
- 1.14.6
+ 1.15.1
diff --git a/omnibus_overrides.rb b/omnibus_overrides.rb
index 0a935ba362..552c2b9822 100644
--- a/omnibus_overrides.rb
+++ b/omnibus_overrides.rb
@@ -17,5 +17,5 @@ override "ruby", version: "2.4.1"
override "ruby-windows-devkit-bash", version: "3.1.23-4-msys-1.0.18"
override "util-macros", version: "1.19.0"
override "xproto", version: "7.0.28"
-override "zlib", version: "1.2.8"
+override "zlib", version: "1.2.11"
override "openssl", version: "1.0.2j"