summaryrefslogtreecommitdiff
path: root/omnibus
diff options
context:
space:
mode:
authorRyan Hass <rhass@users.noreply.github.com>2017-01-19 11:26:09 -0800
committerRyan Hass <rhass@users.noreply.github.com>2017-01-19 12:19:37 -0800
commit9705a2b0d540f15a10f6bacb91b827c302f48748 (patch)
tree029164c618126227e26e317a29b333f06216c26b /omnibus
parentaf9be8fabd1851fcacc6c29c55ac23f2e4f3d46b (diff)
downloadchef-9705a2b0d540f15a10f6bacb91b827c302f48748.tar.gz
Pin version of rainbow gem and update deps.
We need to pin rainbow until the next version of rubygems is released as it is causing build failures in travis. Signed-off-by: Ryan Hass <rhass@users.noreply.github.com>
Diffstat (limited to 'omnibus')
-rw-r--r--omnibus/Gemfile2
-rw-r--r--omnibus/Gemfile.lock6
2 files changed, 4 insertions, 4 deletions
diff --git a/omnibus/Gemfile b/omnibus/Gemfile
index 735b371c62..2bcc49ea24 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: "shain/ruby_windows_monster"
+gem "omnibus-software", github: "chef/omnibus-software", branch: "rhass/COOL-657_ecc-algorithm-support+ruby_windows_monster"
gem "license_scout", github: "chef/license_scout"
gem "pedump"
diff --git a/omnibus/Gemfile.lock b/omnibus/Gemfile.lock
index 9e430e6afc..4409ea83ed 100644
--- a/omnibus/Gemfile.lock
+++ b/omnibus/Gemfile.lock
@@ -8,8 +8,8 @@ GIT
GIT
remote: git://github.com/chef/omnibus-software.git
- revision: f4b1c0f2682907967d10c64850f9c607070697dd
- branch: shain/ruby_windows_monster
+ revision: e17ce57df791747037142a91089eb880c08b6fb5
+ branch: rhass/COOL-657_ecc-algorithm-support+ruby_windows_monster
specs:
omnibus-software (4.0.0)
chef-sugar (>= 3.4.0)
@@ -17,7 +17,7 @@ GIT
GIT
remote: git://github.com/chef/omnibus.git
- revision: 7fc5529b89327c7b1df457f3ac1f60cd2a9d8f64
+ revision: dce5283a85a44484a66a8a84991beba92e46fd12
branch: rhass/COOL-502_with_gcc_investigate
specs:
omnibus (5.5.0)