diff options
| author | Lamont Granquist <lamont@scriptkiddie.org> | 2017-03-15 00:23:30 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-03-15 00:23:30 -0700 |
| commit | 897a54a44d8a77332bd8acfab807a07bba4cf875 (patch) | |
| tree | ebc8132108cfb0177c1cc40cc4ffd9cf2336eda7 | |
| parent | 1aa78b3eb07566d8ba43b6ac71658391f473277c (diff) | |
| parent | 533d9dc7f67b9e5e765102a3fb21590a501f842f (diff) | |
| download | chef-897a54a44d8a77332bd8acfab807a07bba4cf875.tar.gz | |
Merge pull request #5902 from chef/lcg/ruby-2.3.3
bump ruby to 2.3.3
| -rw-r--r-- | omnibus_overrides.rb | 2 | ||||
| -rw-r--r-- | version_policy.rb | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/omnibus_overrides.rb b/omnibus_overrides.rb index 69a5a7af05..6cf6dc7ece 100644 --- a/omnibus_overrides.rb +++ b/omnibus_overrides.rb @@ -11,7 +11,7 @@ override "libyaml", version: "0.1.6" override "makedepend", version: "1.0.5" override "ncurses", version: "5.9" override "pkg-config-lite", version: "0.28-1" -override "ruby", version: "2.3.1" +override "ruby", version: "2.3.3" 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" diff --git a/version_policy.rb b/version_policy.rb index 41206f2dfc..b703e22111 100644 --- a/version_policy.rb +++ b/version_policy.rb @@ -1,5 +1,5 @@ # -# Copyright:: Copyright (c) 2016 Chef Software Inc. +# Copyright:: Copyright (c) 2016-2017, Chef Software Inc. # License:: Apache License, Version 2.0 # # Licensed under the Apache License, Version 2.0 (the "License"); @@ -33,7 +33,7 @@ OMNIBUS_OVERRIDES = { "makedepend" => "1.0.5", "ncurses" => "5.9", "pkg-config-lite" => "0.28-1", - "ruby" => "2.3.1", + "ruby" => "2.3.3", # Leave dev-kit pinned to 4.5 on 32-bit, because 4.7 is 20MB larger and we don't want # to unnecessarily make the client any fatter. (Since it's different between # 32 and 64, we have to do it in the project file still.) |