diff options
| author | Lamont Granquist <lamont@scriptkiddie.org> | 2014-09-08 11:47:16 -0700 |
|---|---|---|
| committer | Lamont Granquist <lamont@scriptkiddie.org> | 2014-09-08 11:47:16 -0700 |
| commit | a463b6df7ed3003447644ca99ea52f7ef0b404ea (patch) | |
| tree | d69de2b77e9f0fed6d7085ee179cb32507a6c8fb | |
| parent | 120b75bca5344d5204793a190dd7978364083870 (diff) | |
| download | chef-a463b6df7ed3003447644ca99ea52f7ef0b404ea.tar.gz | |
bump mixlib-shellout to 2.0, track ohai+mixlib-shellout master
| -rw-r--r-- | Gemfile | 2 | ||||
| -rw-r--r-- | chef.gemspec | 3 |
2 files changed, 2 insertions, 3 deletions
@@ -3,7 +3,7 @@ gemspec :name => "chef" gem "activesupport", "< 4.0.0", :group => :compat_testing, :platform => "ruby" -gem "mixlib-shellout", github: "opscode/mixlib-shellout", branch: "lcg/remove-lc-all-hack" +gem "mixlib-shellout", github: "opscode/mixlib-shellout", branch: "master" gem "ohai", github: "opscode/ohai", branch: "master" group(:docgen) do diff --git a/chef.gemspec b/chef.gemspec index fb5cf8406e..075748a232 100644 --- a/chef.gemspec +++ b/chef.gemspec @@ -19,8 +19,7 @@ Gem::Specification.new do |s| s.add_dependency "mixlib-cli", "~> 1.4" s.add_dependency "mixlib-log", "~> 1.3" s.add_dependency "mixlib-authentication", "~> 1.3" - # FIXME: needs to be bumped to ~> 2.0 once 2.0 is released - s.add_dependency "mixlib-shellout", "~> 1.4" + s.add_dependency "mixlib-shellout", ">= 2.0.0.rc.0", "< 3.0" s.add_dependency "ohai", "~> 7.2" s.add_dependency "ffi-yajl", "~> 1.0", ">= 1.0.2" |