diff options
| author | John Keiser <john@johnkeiser.com> | 2016-07-29 10:23:49 -0700 |
|---|---|---|
| committer | John Keiser <john@johnkeiser.com> | 2016-08-03 14:16:47 -0700 |
| commit | c7b884a820cb975095eab099ecbde9aa70cb0f99 (patch) | |
| tree | d98ad0c0b0d20447c8d86559fef8d148cbc4453d /omnibus | |
| parent | bd2dfa481e7525e1c4a64450a6b018a0b1fcd3f9 (diff) | |
| download | chef-c7b884a820cb975095eab099ecbde9aa70cb0f99.tar.gz | |
Update omnibus and omnibus-software to correct branches
Diffstat (limited to 'omnibus')
| -rw-r--r-- | omnibus/Gemfile | 4 | ||||
| -rw-r--r-- | omnibus/Gemfile.lock | 10 |
2 files changed, 8 insertions, 6 deletions
diff --git a/omnibus/Gemfile b/omnibus/Gemfile index 3e19adfb39..3f2de9d41a 100644 --- a/omnibus/Gemfile +++ b/omnibus/Gemfile @@ -1,7 +1,7 @@ source "https://rubygems.org" -gem "omnibus", git: "https://github.com/chef/omnibus.git" -gem "omnibus-software", git: "https://github.com/chef/omnibus-software.git" +gem "omnibus", github: "chef/omnibus", branch: "ksubrama/gcc_investigate" +gem "omnibus-software", github: "chef/omnibus-software", branch: "ksubrama/ruby23" # pedump pessimistically pins multipart-post to a version from 2013 which makes # bundler very unhappy. Remove this when upstream has merged zed-0xff/pedump#6 . diff --git a/omnibus/Gemfile.lock b/omnibus/Gemfile.lock index a414225c4c..260ff4df96 100644 --- a/omnibus/Gemfile.lock +++ b/omnibus/Gemfile.lock @@ -1,14 +1,16 @@ GIT - remote: https://github.com/chef/omnibus-software.git - revision: f0de110b280a1b6a70493c984565dc56cce9a1e7 + remote: git://github.com/chef/omnibus-software.git + revision: f9938ad5b52b79b6b8960f33cd2670608b499e3d + branch: ksubrama/ruby23 specs: omnibus-software (4.0.0) chef-sugar (>= 3.4.0) omnibus (>= 5.2.0) GIT - remote: https://github.com/chef/omnibus.git - revision: 184c3f7916f0deed7f1b25ecc755c332729fc2a8 + remote: git://github.com/chef/omnibus.git + revision: 45daf5afbef664bb1866561671ec94ccfe307bc6 + branch: ksubrama/gcc_investigate specs: omnibus (5.4.0) aws-sdk (~> 2) |