Merge pull request #1741 from juliandunn/fix-mvps

Fix MVPs

3 files changed, 13 insertions, 8 deletions

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ce47b3e752..e12591838e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -27,7 +27,7 @@
 * chef-repo rake tasks are deprecated; print relevant information for
   each one.
 
-## Last Release: 11.14.0
+## Last Release: 11.14.2
 
 * [**Jess Mink**](https://github.com/jmink):
   Symlinks to directories should be swingable on windows (CHEF-3960)
@@ -74,8 +74,6 @@
   Add Code Climate badge to README.
 * [**Phil Sturgeon**](https://github.com/philsturgeon):
   Documentation that -E is not respected by knife ssh [search]. (CHEF-4778)
-* [**kaustubh**](https://github.com/kaustubh-d):
-  Use 'guest' user on AIX for RSpec tests. (OC-9954)
 * [**Stephan Renatus**](https://github.com/srenatus):
   Fix resource_spec.rb.
 * [**Sander van Harmelen**](https://github.com/svanharmelen):
@@ -121,8 +119,9 @@
 * [**Vasiliy Tolstov**](https://github.com/vtolstov):
   Added the initial exherbo linux support for Chef providers.
 
-
-
+* Fix knife cookbook site share on windows (CHEF-4994)
+* YAJL Allows Invalid JSON File Sending To The Server (CHEF-4899)
+* YAJL Silently Ingesting Invalid JSON and "Normalizing" Incorrectly (CHEF-4565)
 * Update rpm provider checking regex to allow for special characters (CHEF-4893)
 * Allow for spaces in selinux controlled directories (CHEF-5095)
 * Windows batch resource run action fails: " TypeError: can't convert nil into String" (CHEF-5287)
@@ -155,7 +154,10 @@
 * Send md5 checksummed data for registry key if data type is binary, dword, or qword. (Chef-5323)
 * Add warning if host resembles winrm command and knife-windows is not present.
 * Use FFI binders to attach :SendMessageTimeout to avoid DL deprecation warning. (ChefDK Issues 69)
-
+* Use 'guest' user on AIX for RSpec tests. (OC-9954)
+* Added DelayedEvaluator support in LWRP using the `lazy {}` key
+* Fixed a bug where nested resources that inherited from Resource::LWRPBase
+  would not share the same actions/default_action as their parent
 
 ## Previous Release: 11.12.8
 * Fix OS X service provider actions that don't require the service label
diff --git a/CHEF_MVPS.md b/CHEF_MVPS.md
index dfd0985bba..620a516080 100644
--- a/CHEF_MVPS.md
+++ b/CHEF_MVPS.md
@@ -12,11 +12,14 @@ After receiving three MVP awards, we add someone to the hall of fame. We want to
 * Thom May
 * Bryan Berry
 * Bryan McLellan
+* Jeff Blaine
 
 #### The MVP recipients
 
 | Release | Date | MVP |
 |---------|------|-----|
+| [Client 11.14.2](http://www.getchef.com/blog/2014/08/01/release-chef-client-11-14-2/) | 2014-08-01 | Nikhil Benesch |
+| [Client 11.12.0](http://www.getchef.com/blog/2014/04/08/release-chef-client-11-12-0-10-32-2/) | 2014-04-08 | Chris Bandy |
 | [Client 11.10.4](http://www.getchef.com/blog/2014/02/20/chef-client-patch-release-11-10-4/) | 2014-02-20 | Jon Cowie |
 | [Client 11.10.2](http://www.getchef.com/blog/2014/02/18/chef-client-release-11-10-2-10-30-4/) | 2014-02-18 | Eric Tucker |
 | [Client 11.10.0](http://www.getchef.com/blog/2014/02/06/chef-client-11-10-0-release/) | 2014-02-06 | Nikhil Benesch |
@@ -27,6 +30,7 @@ After receiving three MVP awards, we add someone to the hall of fame. We want to
 | [Client 11.4.0](http://www.opscode.com/blog/2013/02/13/chef-client-11-4-0-10-22-0-released/) | 2013-02-13 | Vaidas Jablonskis |
 | [Client 11.2.0](http://www.opscode.com/blog/2013/02/07/chef-client-11-2-0-10-20-0-released/) | 2013-02-06 | Mike Javorski |
 | [Chef 11.0.0](http://www.opscode.com/blog/2013/02/04/chef-11-released/) | 2013-02-04 | Andrea Campi, Bryan Berry |
+| [Chef 10.32.2](http://www.getchef.com/blog/2014/04/08/release-chef-client-11-12-0-10-32-2/) | 2014-04-08 | Phil Dibowitz |
 | [Chef 10.30.4](http://www.getchef.com/blog/2014/02/18/chef-client-release-11-10-2-10-30-4/) | 2014-02-18 | Christopher Laco |
 | [Chef 10.30.2](http://www.getchef.com/blog/2013/12/06/release-chef-client-10-30-2-11-8-2-mixlib-shellout-1-3-0/) | 2013-12-06 | Phil Dibowitz |
 | [Chef 10.28.2](http://www.getchef.com/blog/2013/10/08/release-chef-client-11-6-2-10-28-2/) | 2013-10-08 | Jeff Blaine |
@@ -81,4 +85,3 @@ After receiving three MVP awards, we add someone to the hall of fame. We want to
 | [Chef 0.5.6](http://www.opscode.com/blog/2009/03/06/chef-0-5-6/) | 2009-03-06 | Sean Cribbs |
 | [Chef 0.5.4](http://www.opscode.com/blog/2009/02/13/chef-0-5-4/) | 2009-02-13 | Arjuna Christensen |
 | [Chef 0.5.2](http://www.opscode.com/blog/2009/02/01/chef-0-5-2-and-ohai-0-1-4/) | 2009-02-01 | Bryan McLellan |
-
diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
index b1da138bd8..233b6476ec 100644
--- a/RELEASE_NOTES.md
+++ b/RELEASE_NOTES.md
@@ -1,4 +1,4 @@
-# Chef Client Release Notes:
+# Chef Client Release Notes 11.14.2:
 
 ## http_request resource no longer appends query string