diff options
| author | John Keiser <john@johnkeiser.com> | 2016-07-29 10:23:49 -0700 |
|---|---|---|
| committer | John Keiser <john@johnkeiser.com> | 2016-08-02 10:36:55 -0700 |
| commit | c11427e7cce6474f9c0da47b7db02d78ebb47ba7 (patch) | |
| tree | c3dcd6aec50d607d0571f040a6d6f8014a4c0dfe | |
| parent | f4514c60bb8c6b54c87ccd92f022bdf0722dfa15 (diff) | |
| download | chef-c11427e7cce6474f9c0da47b7db02d78ebb47ba7.tar.gz | |
Update omnibus and omnibus-software to correct branches
| -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 f8cfeec014..01d3b3b82e 100644 --- a/omnibus/Gemfile.lock +++ b/omnibus/Gemfile.lock @@ -1,13 +1,15 @@ GIT - remote: https://github.com/chef/omnibus-software.git - revision: 5e767a6d220f024256439b0a8415eefe923967dc + remote: git://github.com/chef/omnibus-software.git + revision: f7be44704316bae2a088234652855dd23f233ea2 + branch: ksubrama/ruby23 specs: omnibus-software (4.0.0) omnibus (>= 5.2.0) GIT - remote: https://github.com/chef/omnibus.git - revision: 29d390ec93709ceec2667038aed6769ee29a0646 + remote: git://github.com/chef/omnibus.git + revision: 09bb5991e6278e8951be15d225938053aed5fe07 + branch: ksubrama/gcc_investigate specs: omnibus (5.4.0) aws-sdk (~> 2) |