Merge pull request #4827 from chef/12_10_0

Updating version after Chef 12.9 release

5 files changed, 5 insertions, 56 deletions

diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
index c25d6396c2..b25aa52784 100644
--- a/RELEASE_NOTES.md
+++ b/RELEASE_NOTES.md
@@ -1,55 +1,4 @@
 *This file holds "in progress" release notes for the current release under development and is intended for consumption by the Chef Documentation team.
 Please see `https://docs.chef.io/release/<major>-<minor>/release_notes.html` for the official Chef release notes.*
 
-# Chef Client Release Notes 12.9:
-
-## Possible Compat Break with `use_inline_resources` and non-LWRPBase library providers
-
-The correct pattern for LWRPBase-style library providers looks something like:
-
-```ruby
-class MyProvider < Chef::Provider::LWRPBase
-  use_inline_resources
-
-  action :stuff do
-    file "/tmp/whatever.txt"
-  end
-end
-```
-
-Starting in 12.5 the `use_inline_resources` directive was mixed into Chef::Provider directly and had the
-side effect of mixing in the DSL.  After 12.5 it would have worked to write code like this:
-
-```ruby
-class MyProvider < Chef::Provider
-  use_inline_resources
-
-  action :stuff do
-    file "/tmp/whatever.txt"
-  end
-end
-```
-
-But that code would be broken (with a hard syntax error on `use_inline_resources` on prior versions of
-chef-client).  After 12.9 that code will now be broken again on the use of the Recipe DSL which has been removed
-from Chef::Provider when mixing `use_inline_resources` into classes that only inherit from the core
-class.  If any code has been written like this, it should be modified to correctly inherit from
-Chef::Provider::LWRPBase instead (which will have the side effect of fixing it so that it correctly works
-on Chef 11.0-12.5 as well).
-
-## Shorthand options for `log_location`
-
-The `log_location` setting now accepts shorthand `:syslog` and
-`:win_evt` options. `:syslog` is shorthand for `Chef::Log::Syslog.new`
-and `:win_evt` is shorthand for `Chef::Log::WinEvt.new`. All previously
-valid options are still valid, including Logger or Logger-like
-instances, e.g. `Chef::Log::Syslog.new` with other args than the
-defaults.
-
-## chef-client `--daemonize` option now takes an optional integer argument
-
-Optional integer argument (.e.g `chef-client --daemonize 5`) is the
-number of seconds to wait before the first daemonized run. See
-[#3305] for background.
-
-[#3305]: https://github.com/chef/chef/issues/3305
+# Chef Client Release Notes 12.10:
diff --git a/VERSION b/VERSION
index 1363a9b122..4de623cfef 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-12.9.42
\ No newline at end of file
+12.10.0
diff --git a/chef-config/lib/chef-config/version.rb b/chef-config/lib/chef-config/version.rb
index c11c4430de..7562faccf8 100644
--- a/chef-config/lib/chef-config/version.rb
+++ b/chef-config/lib/chef-config/version.rb
@@ -21,7 +21,7 @@
 
 module ChefConfig
   CHEFCONFIG_ROOT = File.expand_path("../..", __FILE__)
-  VERSION = "12.9.42"
+  VERSION = "12.10.0"
 end
 
 #
diff --git a/lib/chef/version.rb b/lib/chef/version.rb
index d92b9b30e4..2554933497 100644
--- a/lib/chef/version.rb
+++ b/lib/chef/version.rb
@@ -21,7 +21,7 @@
 
 class Chef
   CHEF_ROOT = File.expand_path("../..", __FILE__)
-  VERSION = "12.9.42"
+  VERSION = "12.10.0"
 end
 
 #
diff --git a/omnibus/config/projects/chef.rb b/omnibus/config/projects/chef.rb
index eed2f514f6..aec14bfe0e 100644
--- a/omnibus/config/projects/chef.rb
+++ b/omnibus/config/projects/chef.rb
@@ -45,7 +45,7 @@ override :rubygems,     version: "2.5.2"
 
 # Chef Release version pinning
 override :chef, version: "local_source"
-override :ohai, version: "v8.14.0"
+override :ohai, version: "master"
 
 # Global FIPS override flag.
 if windows? || rhel?