Upgrade ohai to 7.0.0.rc.0

5 files changed, 15 insertions, 3 deletions

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 611ab7fcb3..1df8605cca 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -16,6 +16,7 @@
 * CHEF-4773: add ruby-shadow support to Mac and FreeBSD distros
 * Service Provider for MacOSX now supports `enable` and `disable`
 * CHEF-5086: Add reboot_pending? helper to DSL
+* Upgrade ohai to 7.0.0.rc.0
 
 ## Last Release: 11.10.0 (02/06/2014)
 
diff --git a/DOC_CHANGES.md b/DOC_CHANGES.md
index e37f39510e..6380b22753 100644
--- a/DOC_CHANGES.md
+++ b/DOC_CHANGES.md
@@ -16,3 +16,6 @@ Option that is required to be specified if user is attempting to delete a valida
 
 ### -r / --runlist option for chef-client
 Option similar to `-o` which sets or changes the run_list of a node permanently.
+
+### OHAI 7 Upgrade
+Unless there are major issues, 11.12.0 will include OHAI 7. We already have ohai 7 docs in place. We probably need to add some notes to ohai 6 notes that one should now use the newer version when possible.
diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
index cf776296b2..12077a92a0 100644
--- a/RELEASE_NOTES.md
+++ b/RELEASE_NOTES.md
@@ -11,7 +11,7 @@ Details about the thing that changed that needs to get included in the Release N
 #### reboot_pending?  
 
 We have added a ```reboot_pending?``` method to the recipe DSL. This method returns true or false if the operating system
-has a rebooting pending due to updates and a reboot being necessary to complete the installation. It does not report if a reboot has been requested, e.g. if someone has scheduled a restart using shutdown. It currently supports Windows and Ubuntu Linux. 
+has a rebooting pending due to updates and a reboot being necessary to complete the installation. It does not report if a reboot has been requested, e.g. if someone has scheduled a restart using shutdown. It currently supports Windows and Ubuntu Linux.
 
 ```
 Chef::Log.warn "There is a pending reboot, which will affect this Chef run" if reboot_pending?
@@ -22,4 +22,12 @@ execute "Install Application" do
 end
 ```
 
+#### OHAI 7
+
+After spending 3 months in the RC stage, OHAI 7 is now included in Chef Client 11.10.0. Note that Chef Client 10.32.0 still includes OHAI 6.
+
+For more information about the changes in OHAI 7 please see our previous blog post [here](http://www.getchef.com/blog/2014/01/20/ohai-7-0-release-candidate/).
+
 # Chef Client Breaking Changes:
+
+None.
diff --git a/chef.gemspec b/chef.gemspec
index fcc585c363..2724a2aa2b 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.3"
-  s.add_dependency "ohai", "~> 6.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.
diff --git a/lib/chef/version.rb b/lib/chef/version.rb
index 4aff92d00b..25f4a5307d 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.10.0.rc.1'
+  VERSION = '11.12.0.alpha.0'
 end
 
 # NOTE: the Chef::Version class is defined in version_class.rb