diff options
author | lamont-granquist <lamont@scriptkiddie.org> | 2014-09-10 00:22:33 -0700 |
---|---|---|
committer | lamont-granquist <lamont@scriptkiddie.org> | 2014-09-10 00:22:33 -0700 |
commit | 549f629d1b23010ebd9dd811babca7f174fd6af1 (patch) | |
tree | a2894218815f7e2a6ae6f8bb4f0319fe8473bd00 | |
parent | 686f43d715a1be37189f05dc71ad2123356f0e55 (diff) | |
parent | 2cfc303dd628d8d54b8cb1409b8d4a3b3c20e5eb (diff) | |
download | chef-549f629d1b23010ebd9dd811babca7f174fd6af1.tar.gz |
Merge pull request #2025 from opscode/lcg/fix-e2e
pull ohai rc release
-rw-r--r-- | Gemfile | 3 | ||||
-rw-r--r-- | chef.gemspec | 2 |
2 files changed, 1 insertions, 4 deletions
@@ -3,9 +3,6 @@ gemspec :name => "chef" gem "activesupport", "< 4.0.0", :group => :compat_testing, :platform => "ruby" -gem "mixlib-shellout", github: "opscode/mixlib-shellout", branch: "master" -gem "ohai", github: "opscode/ohai", branch: "master" - group(:docgen) do gem "yard" end diff --git a/chef.gemspec b/chef.gemspec index 075748a232..481b120fe6 100644 --- a/chef.gemspec +++ b/chef.gemspec @@ -20,7 +20,7 @@ Gem::Specification.new do |s| s.add_dependency "mixlib-log", "~> 1.3" s.add_dependency "mixlib-authentication", "~> 1.3" s.add_dependency "mixlib-shellout", ">= 2.0.0.rc.0", "< 3.0" - s.add_dependency "ohai", "~> 7.2" + s.add_dependency "ohai", ">= 7.6.0.rc.0" s.add_dependency "ffi-yajl", "~> 1.0", ">= 1.0.2" s.add_dependency "net-ssh", "~> 2.6" |