From c3e1afbefd73de19875a10392e85026f52577dc0 Mon Sep 17 00:00:00 2001 From: Lamont Granquist Date: Mon, 3 Apr 2017 20:34:20 -0700 Subject: Chef-13: bump bundler to 1.14.6 Signed-off-by: Lamont Granquist --- omnibus_overrides.rb | 2 +- version_policy.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/omnibus_overrides.rb b/omnibus_overrides.rb index 32f460499c..0ec98b4fc5 100644 --- a/omnibus_overrides.rb +++ b/omnibus_overrides.rb @@ -1,6 +1,6 @@ # DO NOT EDIT. Generated by "rake dependencies". Edit version_policy.rb instead. override :rubygems, version: "2.6.11" -override :bundler, version: "1.12.5" +override :bundler, version: "1.14.6" override "libffi", version: "3.2.1" override "libiconv", version: "1.14" override "liblzma", version: "5.2.2" diff --git a/version_policy.rb b/version_policy.rb index 39bc81f2fa..357405ed46 100644 --- a/version_policy.rb +++ b/version_policy.rb @@ -20,7 +20,7 @@ OMNIBUS_OVERRIDES = { # Lower level library pins ## according to comment in omnibus-sw, latest versions don't work on solaris # https://github.com/chef/omnibus-software/blob/aefb7e79d29ca746c3f843673ef5e317fa3cba54/config/software/libtool.rb#L23 - :bundler => "1.12.5", # until we figure out how to work with 1.13.0 + :bundler => "1.14.6", # until we figure out how to work with 1.13.0 "libffi" => "3.2.1", "libiconv" => "1.14", "liblzma" => "5.2.2", -- cgit v1.2.1