From b3c93a2722922017a0ffafbc583e5a9bad8feb53 Mon Sep 17 00:00:00 2001 From: Steven Danna Date: Tue, 25 Jul 2017 11:15:36 +0100 Subject: Test new libiconv on more platforms Signed-off-by: Steven Danna --- omnibus/Gemfile | 2 +- omnibus/Gemfile.lock | 17 +++++++++-------- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/omnibus/Gemfile b/omnibus/Gemfile index 652a6e69b8..44e7355211 100644 --- a/omnibus/Gemfile +++ b/omnibus/Gemfile @@ -1,7 +1,7 @@ source "https://rubygems.org" gem "omnibus", git: "https://github.com/chef/omnibus" -gem "omnibus-software", git: "https://github.com/chef/omnibus-software" +gem "omnibus-software", git: "https://github.com/chef/omnibus-software", branch: 'ssd/libiconv-update' gem "license_scout", git: "https://github.com/chef/license_scout" gem "pedump" diff --git a/omnibus/Gemfile.lock b/omnibus/Gemfile.lock index fb36fd59cd..d62b6e020c 100644 --- a/omnibus/Gemfile.lock +++ b/omnibus/Gemfile.lock @@ -25,7 +25,8 @@ GIT GIT remote: https://github.com/chef/omnibus-software - revision: a5184e2d973352d93923b4e979479e079b80364d + revision: c937750a4570e26e9a6650002c937beddb218068 + branch: ssd/libiconv-update specs: omnibus-software (4.0.0) chef-sugar (>= 3.4.0) @@ -38,13 +39,13 @@ GEM public_suffix (~> 2.0, >= 2.0.2) artifactory (2.8.2) awesome_print (1.8.0) - aws-sdk (2.10.15) - aws-sdk-resources (= 2.10.15) - aws-sdk-core (2.10.15) + aws-sdk (2.10.16) + aws-sdk-resources (= 2.10.16) + aws-sdk-core (2.10.16) aws-sigv4 (~> 1.0) jmespath (~> 1.0) - aws-sdk-resources (2.10.15) - aws-sdk-core (= 2.10.15) + aws-sdk-resources (2.10.16) + aws-sdk-core (= 2.10.16) aws-sigv4 (1.0.1) berkshelf (4.3.5) addressable (~> 2.3, >= 2.3.4) @@ -140,7 +141,7 @@ GEM mixlib-shellout (2.3.2-universal-mingw32) win32-process (~> 0.8.2) wmi-lite (~> 1.0) - mixlib-versioning (1.1.0) + mixlib-versioning (1.2.1) molinillo (0.4.5) multi_json (1.12.1) multipart-post (2.0.0) @@ -268,4 +269,4 @@ DEPENDENCIES winrm-fs (~> 1.0) BUNDLED WITH - 1.15.1 + 1.15.2 -- cgit v1.2.1