summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorsersut <serdar@opscode.com>2014-01-20 11:34:12 -0800
committersersut <serdar@opscode.com>2014-01-20 11:34:12 -0800
commitdfcc569b059e0376ebc9b26d20d9e9e65bc882d4 (patch)
tree7177c89c090555ecf50cf3c4e4116e67e496b3e7
parent3c98f761f924ff459529e5bf096f817dbd61e0e3 (diff)
downloadchef-ohai-7.tar.gz
Update gemspec to pick up ohai 7.0.0.rc.0 from rubygems.11.8.4.ohai7.0ohai-7
-rw-r--r--Gemfile3
-rw-r--r--chef.gemspec2
2 files changed, 1 insertions, 4 deletions
diff --git a/Gemfile b/Gemfile
index 88338c2a4d..d4b7ce83f5 100644
--- a/Gemfile
+++ b/Gemfile
@@ -3,9 +3,6 @@ gemspec :name => "chef"
gem "activesupport", "< 4.0.0", :group => :compat_testing, :platform => "ruby"
-# Remove this line before shipping Chef version for Ohai 7.0 Release Candidate.
-gem "ohai", :git => "https://github.com/opscode/ohai.git"
-
group(:docgen) do
gem "ronn"
gem "yard"
diff --git a/chef.gemspec b/chef.gemspec
index ed0ae15ac5..a6dcbec635 100644
--- a/chef.gemspec
+++ b/chef.gemspec
@@ -17,7 +17,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", "~> 1.2"
- s.add_dependency "ohai", "= 7.0.0.alpha.0"
+ s.add_dependency "ohai", "= 7.0.0.rc.0"
s.add_dependency "rest-client", ">= 1.0.4", "< 1.7.0"
# rest-client has an unbounded dependency on mime-types.