summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRyan Hass <rhass@chef.io>2016-09-06 14:11:33 -0700
committerRyan Hass <rhass@chef.io>2016-09-06 14:11:33 -0700
commita35f1eb8097693e3d816d78d964f97be65b0ea06 (patch)
treeff56e9e9963ec597e4604128ef95020943a8d4e7
parent98e25889695bda473ba6d72959eb022306f6ea31 (diff)
downloadchef-rhass/COOL-502.tar.gz
Pin omnibus branch for testing.rhass/COOL-502
The omnibus branch `rhass/COOL-502_with_gcc_investigate` contains my Solaris patch along with the `sersut/ff-ksubrama/gcc_investigate` branch changes.
-rw-r--r--omnibus/Gemfile2
-rw-r--r--omnibus/Gemfile.lock4
2 files changed, 3 insertions, 3 deletions
diff --git a/omnibus/Gemfile b/omnibus/Gemfile
index 2f2df4126f..aae6a0e9c0 100644
--- a/omnibus/Gemfile
+++ b/omnibus/Gemfile
@@ -1,6 +1,6 @@
source "https://rubygems.org"
-gem "omnibus", github: "chef/omnibus", branch: "sersut/ff-ksubrama/gcc_investigate"
+gem "omnibus", github: "chef/omnibus", branch: "rhass/COOL-502_with_gcc_investigate"
gem "omnibus-software", github: "chef/omnibus-software", branch: "lcg/ruby23"
gem "license_scout", github: "chef/license_scout"
diff --git a/omnibus/Gemfile.lock b/omnibus/Gemfile.lock
index a8ea4f1ad3..d6d5c48245 100644
--- a/omnibus/Gemfile.lock
+++ b/omnibus/Gemfile.lock
@@ -17,8 +17,8 @@ GIT
GIT
remote: git://github.com/chef/omnibus.git
- revision: 96d4695285c9530ff3b6b8160bc46e3ac6b19dd0
- branch: sersut/ff-ksubrama/gcc_investigate
+ revision: 98c9af20a0f79b6ac205613f509b4725eea47f7b
+ branch: rhass/COOL-502_with_gcc_investigate
specs:
omnibus (5.5.0)
aws-sdk (~> 2)