diff options
author | Adam Edwards <adamed@opscode.com> | 2014-09-06 06:45:40 -0700 |
---|---|---|
committer | Adam Edwards <adamed@opscode.com> | 2014-09-06 06:45:40 -0700 |
commit | a591d0bc63f7f9f84c1ea79e1ccf590212210208 (patch) | |
tree | eeeeafa98fa0dfebf15e51535e318d55a0016a3e | |
parent | 1e4b00fc95ddbd7ba39d96941054435d3f385586 (diff) | |
parent | 869f9d8d5467ec117439db337b3341389423fe82 (diff) | |
download | chef-a591d0bc63f7f9f84c1ea79e1ccf590212210208.tar.gz |
Merge pull request #2008 from opscode/adamedx/ohai-7-4-and-rc211.16.0.rc.2
Depend on released Ohai 7.4 for Chef 11.16.0.rc.2
-rw-r--r-- | chef.gemspec | 2 | ||||
-rw-r--r-- | lib/chef/version.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/chef.gemspec b/chef.gemspec index 8f25363124..7c53618a51 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.4" - s.add_dependency "ohai", "7.4.0.rc.0" + s.add_dependency "ohai", "~> 7.4" # Lock down rest-client to avoid pulling in rdoc and breaking Omnibus builds # on Solaris. See the original issue for more details: diff --git a/lib/chef/version.rb b/lib/chef/version.rb index 7275587c3d..9db546781e 100644 --- a/lib/chef/version.rb +++ b/lib/chef/version.rb @@ -17,7 +17,7 @@ class Chef CHEF_ROOT = File.dirname(File.expand_path(File.dirname(__FILE__))) - VERSION = '11.16.0.rc.1' + VERSION = '11.16.0.rc.2' end # NOTE: the Chef::Version class is defined in version_class.rb |