Merge pull request #4817 from chef/129_release_prep

12.9 release prep

3 files changed, 48 insertions, 7 deletions

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2e39a2af49..552f21c444 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,52 @@
 # Change Log
 
+## [v12.9](https://github.com/chef/chef/tree/v12.9.37) (2016-04-09)
+[Full Changelog](https://github.com/chef/chef/compare/v12.8.1...v12.9.37)
+
+**Implemented enhancements:**
+
+- Sftp remote file support [\#4750](https://github.com/chef/chef/pull/4750) ([jkerry](https://github.com/jkerry))
+- Setting init\_command should be accepted instead of specific command overrides [\#4709](https://github.com/chef/chef/pull/4709) ([coderanger](https://github.com/coderanger))
+- Add a NoOp provider [\#4798](https://github.com/chef/chef/pull/4798) ([thommay](https://github.com/thommay))
+- Add ability to notify from inside LWRP to wrapping resource\_collections [\#4017](https://github.com/chef/chef/issues/4017)
+- Notifications from LWRPS/sub-resources can trigger resources in outer run\_context scopes [\#4741](https://github.com/chef/chef/pull/4741) ([lamont-granquist](https://github.com/lamont-granquist))
+- Improve the docs generated by knife cookbook create [\#4757](https://github.com/chef/chef/pull/4757) ([tas50](https://github.com/tas50))
+- Need Config/CLI options to move interval+splay sleep to end of client loop [\#3305](https://github.com/chef/chef/issues/3305)
+- Add optional integer argument for --daemonize option [\#4759](https://github.com/chef/chef/pull/4759) ([jrunning](https://github.com/jrunning))
+- Add shorthand :syslog and :win\_evt for log\_location config [\#4751](https://github.com/chef/chef/pull/4751) ([jrunning](https://github.com/jrunning))
+
+**Fixed bugs:**
+
+- chef\_gem and gem metadata don't play well [\#4710](https://github.com/chef/chef/issues/4710)
+- Fix cookbook metadata 'gem' command to make it useful [\#4809](https://github.com/chef/chef/pull/4809) ([lamont-granquist](https://github.com/lamont-granquist))
+- Convert timeout config to integer [\#4787](https://github.com/chef/chef/pull/4787) ([chefsalim](https://github.com/chefsalim))
+- The mount resource is not idempotent on windows [\#3861](https://github.com/chef/chef/issues/3861)
+- fix for \#4715 - unset TMPDIR in homebrew package provider [\#4716](https://github.com/chef/chef/pull/4716) ([gips0n](https://github.com/gips0n))
+- tons of "Deprecation class overwrites LWRP resource" WARNING SPAM with chefspec [\#4668](https://github.com/chef/chef/issues/4668)
+
+**Merged pull requests:**
+
+- Add apt\_repository resource [\#4782](https://github.com/chef/chef/pull/4782) ([thommay](https://github.com/thommay))
+- Point to the right license file for chef. [\#4811](https://github.com/chef/chef/pull/4811) ([sersut](https://github.com/sersut))
+- add omnibus license metadata [\#4805](https://github.com/chef/chef/pull/4805) ([patrick-wright](https://github.com/patrick-wright))
+- Add default timeout [\#4804](https://github.com/chef/chef/pull/4804) ([chefsalim](https://github.com/chefsalim))
+- Spec break on Windows due to temp dir and short path names [\#4776](https://github.com/chef/chef/pull/4776) ([adamedx](https://github.com/adamedx))
+- Require chef/version since it's used here [\#4762](https://github.com/chef/chef/pull/4762) ([jkeiser](https://github.com/jkeiser))
+- remove pry from rbx build [\#4761](https://github.com/chef/chef/pull/4761) ([lamont-granquist](https://github.com/lamont-granquist))
+- ruby 2.0.0 is EOL [\#4752](https://github.com/chef/chef/pull/4752) ([lamont-granquist](https://github.com/lamont-granquist))
+- supresses parser gem errors [\#4755](https://github.com/chef/chef/pull/4755) ([lamont-granquist](https://github.com/lamont-granquist))
+- Set inherit=false on the fallback provider constant lookup. [\#4753](https://github.com/chef/chef/pull/4753) ([coderanger](https://github.com/coderanger))
+
+**Closed issues:**
+
+- Uploading an encrypted data bag to Chef server fails [\#4815](https://github.com/chef/chef/issues/4815)
+- powershell\_script does not have PSCredential capability [\#4589](https://github.com/chef/chef/issues/4589)
+- Documentation don't include how to setup mail server during deployment of Chef server [\#4807](https://github.com/chef/chef/issues/4807)
+- Resource 'mount' and chef 12.5.1 [\#4056](https://github.com/chef/chef/issues/4056)
+- Incorrect $TMPDIR environment variable on OS X [\#4715](https://github.com/chef/chef/issues/4715)
+- group provider on suse Linux adds user multiple times [\#4689](https://github.com/chef/chef/issues/4689)
+- Unexpected error when using "knife cookbook show ...." [\#4659](https://github.com/chef/chef/issues/4659)
+
 ## [12.8.1](https://github.com/chef/chef/tree/12.8.1) (2016-03-07)
 [Full Changelog](https://github.com/chef/chef/compare/12.7.2...12.8.1)
 
diff --git a/omnibus/Gemfile b/omnibus/Gemfile
index 295fb2f490..ef1dec354d 100644
--- a/omnibus/Gemfile
+++ b/omnibus/Gemfile
@@ -7,12 +7,6 @@ gem "omnibus-software", git: "https://github.com/chef/omnibus-software.git"
 # bundler very unhappy. Remove this when upstream has merged zed-0xff/pedump#6 .
 gem "pedump", git: "https://github.com/ksubrama/pedump.git", branch: "patch-1"
 
-# `json_pure` has a bug in it that is failing Chef builds.  We include the
-# json gem into the Gemfile so that running `bundle exec` will have
-# this gem on the load path, and cause `require 'json/ext'` to succeed.  This
-# prevents loading the `json_pure` gem
-gem "json", ">= 1.8.1"
-
 # This development group is installed by default when you run `bundle install`,
 # but if you are using Omnibus in a CI-based infrastructure, you do not need
 # the Test Kitchen-based build lab. You can skip these unnecessary dependencies
diff --git a/omnibus/config/projects/chef.rb b/omnibus/config/projects/chef.rb
index aec14bfe0e..eed2f514f6 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: "master"
+override :ohai, version: "v8.14.0"
 
 # Global FIPS override flag.
 if windows? || rhel?