summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--omnibus/Gemfile2
-rw-r--r--omnibus/Gemfile.lock4
-rw-r--r--omnibus_overrides.rb1
3 files changed, 4 insertions, 3 deletions
diff --git a/omnibus/Gemfile b/omnibus/Gemfile
index 2bcc49ea24..735b371c62 100644
--- a/omnibus/Gemfile
+++ b/omnibus/Gemfile
@@ -1,7 +1,7 @@
source "https://rubygems.org"
gem "omnibus", github: "chef/omnibus", branch: "rhass/COOL-502_with_gcc_investigate"
-gem "omnibus-software", github: "chef/omnibus-software", branch: "rhass/COOL-657_ecc-algorithm-support+ruby_windows_monster"
+gem "omnibus-software", github: "chef/omnibus-software", branch: "shain/ruby_windows_monster"
gem "license_scout", github: "chef/license_scout"
gem "pedump"
diff --git a/omnibus/Gemfile.lock b/omnibus/Gemfile.lock
index 4409ea83ed..8454d6aed4 100644
--- a/omnibus/Gemfile.lock
+++ b/omnibus/Gemfile.lock
@@ -8,8 +8,8 @@ GIT
GIT
remote: git://github.com/chef/omnibus-software.git
- revision: e17ce57df791747037142a91089eb880c08b6fb5
- branch: rhass/COOL-657_ecc-algorithm-support+ruby_windows_monster
+ revision: f4b1c0f2682907967d10c64850f9c607070697dd
+ branch: shain/ruby_windows_monster
specs:
omnibus-software (4.0.0)
chef-sugar (>= 3.4.0)
diff --git a/omnibus_overrides.rb b/omnibus_overrides.rb
index 0d740ff046..be544badca 100644
--- a/omnibus_overrides.rb
+++ b/omnibus_overrides.rb
@@ -1,6 +1,7 @@
# DO NOT EDIT. Generated by "rake dependencies". Edit version_policy.rb instead.
override :rubygems, version: "2.6.8"
override :bundler, version: "1.12.5"
+override :rainbow, version: "2.1.0"
override "libffi", version: "3.2.1"
override "libiconv", version: "1.14"
override "liblzma", version: "5.2.2"