Merge pull request #1450 from opscode/sersut/changelog

Updates to CHANGELOG and CONTRIBUTIONS

2 files changed, 27 insertions, 30 deletions

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 696ca05e93..21ec07dd6f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,33 +1,49 @@
 # Chef Client Changelog
 
 ## Unreleased
+
+* [**Phil Dibowitz**](https://github.com/jaymzh):
+  SIGTERM will once-more kill a non-daemonized chef-client (CHEF-5172)
+* [**Pierre Ynard**](https://github.com/linkfanel):
+  chef-service-manager should run as a non-interactive service (CHEF-5150)
+* [**Paul Russell**](https://github.com/Tensibai):
+  Fix file:// URI support in remote\_file on windows (CHEF-4472)
+* [**John Dyer**](https://github.com/johntdyer):
+  Catch HTTPServerException for 404 in remote_file retry (CHEF-5116)
+* [**Pavel Yudin**](https://github.com/Kasen):
+  Providers are now set correctly on CloudLinux. (CHEF-5182)
+* [**Joe Richards**](https://github.com/viyh):
+  Made -E option to work with single lettered environments. (CHEF-3075)
+* [**Jimmy McCrory**](https://github.com/JimmyMcCrory):
+  Added a 'knife node environment set' command. (CHEF-1910)
+* [**Hongbin Lu**](https://github.com/hongbin):
+  Made bootstrap report authentication exceptions. (CHEF-5161)
+* [**Richard Manyanza**](https://github.com/liseki):
+  Made `freebsd_package` resource use the brand new "pkgng" package
+  manager when available.(CHEF-4637)
+* [**Nikhil Benesch**](https://github.com/benesch):
+  Implemented a threaded download queue for synchronizing cookbooks. (CHEF-4423)
+
+
 * Print nested LWRPs with indentation in doc formatter output
 * Make local mode stable enough to run chef-pedant
-* Catch HTTPServerException for 404 in remote\_file retry (CHEF-5116)
 * Wrap code in block context when syntax checking so `return` is valid
   (CHEF-5199)
 * Quote git resource rev\_pattern to prevent glob matching files (CHEF-4940)
-* chef-service-manager now runs as a non-interactive service (CHEF-5150)
-* Fix remote\_file support for file:// URI on windows (CHEF-4472)
 * Fix OS X service provider actions that don't require the service label
   to work when there is no plist. (CHEF-5223)
 * User resource now only prints the name during why-run runs. (CHEF-5180)
-* Providers are now set correctly on CloudLinux. (CHEF-5182)
-* -E option now works with single lettered environments (CHEF-3075)
 * Set --run-lock-timeout to wait/bail if another client has the runlock (CHEF-5074)
-* A node's environment can now be set with 'knife node environment set NODE ENVIRONMENT' (CHEF-1910)
 * remote\_file's source attribute does not support DelayedEvaluators (CHEF-5162)
 * `option` attribute of mount resource now supports lazy evaluation. (CHEF-5163)
 * `force_unlink` now only unlinks if the file already exists. (CHEF-5015)
-* bootstrap no reports authentication failures. (CHEF-5161)
 * `chef_gem` resource now uses omnibus gem binary. (CHEF-5092)
-* `freebsd_package` resource now uses the brand new "pkgng" package manager when available. (CHEF-4637)
 * chef-full template gets knife options to override install script url, add wget/curl cli options, and custom install commands (CHEF-4697)
 * knife now bootstraps node with the latest current version of chef-client. (CHEF-4911)
-* Add a threaded download queue for synchronizing cookbooks in parallel. (CHEF-4423)
 * Add config options for attribute whitelisting in node.save. (CHEF-3811)
 
-## Last Release: 11.12.0 RC1 (03/31/2014)
-* SIGTERM will once-more kill a non-daemonized chef-client (CHEF-5172)
+## Release: 11.12.4 (04/30/2014)
+http://www.getchef.com/blog/2014/04/30/release-chef-client-11-12-4-ohai-7-0-4/
 
+## Release: 11.12.0 (03/31/2014)
 http://www.getchef.com/blog/2014/03/31/release-candidates-chef-client-11-12-0-10-32-0/
diff --git a/CONTRIBUTIONS.md b/CONTRIBUTIONS.md
deleted file mode 100644
index 892af90134..0000000000
--- a/CONTRIBUTIONS.md
+++ /dev/null
@@ -1,19 +0,0 @@
-<!---
-This file is reset every time a new release is done. The contents of this file are for the currently unreleased version.
-
-Example Contribution:
-* **kalistec**: Improved file resource greatly.
--->
-# Chef Client Contributions:
-
-* **jaymzh**: SIGTERM will once-more kill a non-daemonized chef-client (CHEF-5172)
-* **linkfanel**: chef-service-manager should run as a non-interactive service (CHEF-5150)
-* **Tensibai**: Fix file:// URI support in remote\_file on windows (CHEF-4472)
-* **johntdyer**: Catch HTTPServerException for 404 in remote_file retry (CHEF-5116)
-* **Kasen**: Providers are now set correctly on CloudLinux. (CHEF-5182)
-* **viyh**: Made -E option to work with single lettered environments. (CHEF-3075)
-* **JimmyMcCrory**: Added a 'knife node environment set' command. (CHEF-1910)
-* **hongbin**: Made bootstrap report authentication exceptions. (CHEF-5161)
-* **liseki**: Made `freebsd_package` resource use the brand new "pkgng" package
-  manager when available.(CHEF-4637)
-* **benesch**: Implemented a threaded download queue for synchronizing cookbooks. (CHEF-4423)