diff options
| author | Ryan Hass <rhass@chef.io> | 2016-09-06 17:43:03 -0700 |
|---|---|---|
| committer | Ryan Hass <rhass@chef.io> | 2016-09-06 17:43:03 -0700 |
| commit | 7120ffda15967cb5c0c2615af7e10ae437aedbe6 (patch) | |
| tree | cf07f096de6179a734b28011f9f50002e5dcddb1 | |
| parent | a35f1eb8097693e3d816d78d964f97be65b0ea06 (diff) | |
| download | chef-rhass/COOL-502_regression-test.tar.gz | |
Pin chef-zero to current version on master.rhass/COOL-502_regression-test
There appears to be a regression with Ruby 2.3.1 and chef-zero which
this may resolve.
| -rw-r--r-- | omnibus/Gemfile | 1 | ||||
| -rw-r--r-- | omnibus/Gemfile.lock | 14 |
2 files changed, 15 insertions, 0 deletions
diff --git a/omnibus/Gemfile b/omnibus/Gemfile index aae6a0e9c0..6d94049985 100644 --- a/omnibus/Gemfile +++ b/omnibus/Gemfile @@ -3,6 +3,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: "lcg/ruby23" gem "license_scout", github: "chef/license_scout" +gem "chef-zero", github: "chef/chef-zero" # 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 d6d5c48245..6a5a10aa6a 100644 --- a/omnibus/Gemfile.lock +++ b/omnibus/Gemfile.lock @@ -1,4 +1,15 @@ GIT + remote: git://github.com/chef/chef-zero.git + revision: 92e1e6eae3d8d842cf1eede56124ebd3ba9945c9 + specs: + chef-zero (5.0.0) + ffi-yajl (~> 2.2) + hashie (>= 2.0, < 4.0) + mixlib-log (~> 1.3) + rack (~> 2.0) + uuidtools (~> 2.1) + +GIT remote: git://github.com/chef/license_scout.git revision: 6e501d31d3957a95388422595db8fe5937092b15 specs: @@ -184,6 +195,7 @@ GEM pry-stack_explorer (0.4.9.2) binding_of_caller (>= 0.7) pry (>= 0.9.11) + rack (2.0.1) retryable (2.0.4) ridley (4.6.1) addressable @@ -227,6 +239,7 @@ GEM thor (0.19.1) timers (4.0.4) hitimes + uuidtools (2.1.5) varia_model (0.4.1) buff-extensions (~> 1.0) hashie (>= 2.0.2, < 4.0.0) @@ -254,6 +267,7 @@ PLATFORMS DEPENDENCIES berkshelf (~> 4.0) + chef-zero! kitchen-vagrant (~> 0.19.0) license_scout! omnibus! |