diff options
| author | Lamont Granquist <lamont@scriptkiddie.org> | 2018-02-28 12:03:07 -0800 |
|---|---|---|
| committer | Lamont Granquist <lamont@scriptkiddie.org> | 2018-02-28 12:03:07 -0800 |
| commit | d11104e01578977ce68e835deae2c04627b2ec74 (patch) | |
| tree | e8ab560a69abfdf41b911948d07fdeb26e775f55 /omnibus | |
| parent | bc72676b2454f8a2bd6636daa806b1f4e01fb08c (diff) | |
| download | chef-d11104e01578977ce68e835deae2c04627b2ec74.tar.gz | |
chefstyle/omnibus-software/omnibus back to master
Signed-off-by: Lamont Granquist <lamont@scriptkiddie.org>
Diffstat (limited to 'omnibus')
| -rw-r--r-- | omnibus/Gemfile | 4 | ||||
| -rw-r--r-- | omnibus/Gemfile.lock | 12 |
2 files changed, 8 insertions, 8 deletions
diff --git a/omnibus/Gemfile b/omnibus/Gemfile index 9470a86266..67c6bb4571 100644 --- a/omnibus/Gemfile +++ b/omnibus/Gemfile @@ -1,7 +1,7 @@ source "https://rubygems.org" -gem "omnibus", git: "https://github.com/chef/omnibus", branch: "lcg/improve-appbundling" -gem "omnibus-software", git: "https://github.com/chef/omnibus-software", branch: "lcg/appbundle-0.11-without" +gem "omnibus", git: "https://github.com/chef/omnibus", branch: "master" +gem "omnibus-software", git: "https://github.com/chef/omnibus-software", branch: "master" gem "pedump" diff --git a/omnibus/Gemfile.lock b/omnibus/Gemfile.lock index bc5e9cbbbf..8a81e35bb7 100644 --- a/omnibus/Gemfile.lock +++ b/omnibus/Gemfile.lock @@ -1,7 +1,7 @@ GIT remote: https://github.com/chef/omnibus - revision: bc76c699bc8b85959bb546933efa6b5cf0ff1823 - branch: lcg/improve-appbundling + revision: 9a3a97bb0c6b437524fdea15b4cd15a65ff6ac29 + branch: master specs: omnibus (5.6.10) aws-sdk (~> 2) @@ -18,8 +18,8 @@ GIT GIT remote: https://github.com/chef/omnibus-software - revision: 3f6f9836cb041ad6187b7b52a25cf759fc830bc6 - branch: lcg/appbundle-0.11-without + revision: f0c34cd3a21c4da6207721914213ac775b44570f + branch: master specs: omnibus-software (4.0.0) chef-sugar (>= 3.4.0) @@ -150,8 +150,8 @@ GEM nori (2.6.0) octokit (4.8.0) sawyer (~> 0.8.0, >= 0.5.3) - ohai (13.7.1) - chef-config (>= 12.5.0.alpha.1, < 14) + ohai (14.0.0) + chef-config (>= 12.5.0.alpha.1, < 15) ffi (~> 1.9) ffi-yajl (~> 2.2) ipaddress |