filtered out and reorged the changelog

1 files changed, 22 insertions, 46 deletions

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3ad9201a61..9dda4a7d1f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,68 +3,44 @@
 ## [v12.14.60](https://github.com/chef/chef/tree/v12.14.60) (2016-09-09)
 [Full Changelog](https://github.com/chef/chef/compare/v12.13.37...v12.14.60)
 
-**Merged pull requests:**
+**Enhancements:**
 
-- Fixes GH-4955, allowing local gems with remote dependencies [\#5098](https://github.com/chef/chef/pull/5098) ([jyaworski](https://github.com/jyaworski))
 - Only support Solaris 10u11 and newer [\#5264](https://github.com/chef/chef/pull/5264) ([rhass](https://github.com/rhass))
-- yet another dependency update PR [\#5295](https://github.com/chef/chef/pull/5295) ([mwrock](https://github.com/mwrock))
 - Added code to handle deletion of directories on Windows that are symlinks. [\#5234](https://github.com/chef/chef/pull/5234) ([Aliasgar16](https://github.com/Aliasgar16))
-- readability improvements to options parsing code [\#5289](https://github.com/chef/chef/pull/5289) ([lamont-granquist](https://github.com/lamont-granquist))
-- Hook up the recipe\_file\_loaded event which was defined but not actually called [\#5281](https://github.com/chef/chef/pull/5281) ([coderanger](https://github.com/coderanger))
-- use threads to workaround Process.spawn buginess in chef-solo unit test [\#5279](https://github.com/chef/chef/pull/5279) ([lamont-granquist](https://github.com/lamont-granquist))
+- Readability improvements to options parsing code [\#5289](https://github.com/chef/chef/pull/5289) ([lamont-granquist](https://github.com/lamont-granquist))
 - Add Hash type to launchd:keep\_alive [\#5182](https://github.com/chef/chef/pull/5182) ([erikng](https://github.com/erikng))
 - Added timeout during removing of windows package [\#5250](https://github.com/chef/chef/pull/5250) ([dheerajd-msys](https://github.com/dheerajd-msys))
-- remove kitchen-inspec and train pins in acceptance [\#5284](https://github.com/chef/chef/pull/5284) ([mwrock](https://github.com/mwrock))
-- bumping mixlib-config [\#5280](https://github.com/chef/chef/pull/5280) ([mwrock](https://github.com/mwrock))
-- bump tk in acceptance and omnibus-software for ruby patch [\#5278](https://github.com/chef/chef/pull/5278) ([mwrock](https://github.com/mwrock))
-- tweak chef-solo run\_lock timing test [\#5276](https://github.com/chef/chef/pull/5276) ([lamont-granquist](https://github.com/lamont-granquist))
-- bump openssl to 1.0.2h [\#5260](https://github.com/chef/chef/pull/5260) ([lamont-granquist](https://github.com/lamont-granquist))
-- Pin to berkshelf 4.3.5 in acceptance [\#5272](https://github.com/chef/chef/pull/5272) ([mwrock](https://github.com/mwrock))
-- update acceptance deps based on winrm 2 release and squashed tk branch [\#5270](https://github.com/chef/chef/pull/5270) ([mwrock](https://github.com/mwrock))
-- fix gem\_package regression in master [\#5262](https://github.com/chef/chef/pull/5262) ([lamont-granquist](https://github.com/lamont-granquist))
-- Added fix for spaces in profile identifiers [\#5159](https://github.com/chef/chef/pull/5159) ([natewalck](https://github.com/natewalck))
-- add a hook for compat\_resource [\#5259](https://github.com/chef/chef/pull/5259) ([lamont-granquist](https://github.com/lamont-granquist))
-- Fix flush\_cache issues in yum\_package [\#5258](https://github.com/chef/chef/pull/5258) ([jaymzh](https://github.com/jaymzh))
-- rewrite linux\_user provider check\_lock [\#5248](https://github.com/chef/chef/pull/5248) ([lamont-granquist](https://github.com/lamont-granquist))
-- Use symbols instead of strings as keys for systemd user property [\#5241](https://github.com/chef/chef/pull/5241) ([joshuamiller01](https://github.com/joshuamiller01))
-- Use upstart goal state as service status [\#5249](https://github.com/chef/chef/pull/5249) ([evan2645](https://github.com/evan2645))
+- Bump openssl to 1.0.2h [\#5260](https://github.com/chef/chef/pull/5260) ([lamont-granquist](https://github.com/lamont-granquist))
+- Rewrite linux\_user provider check\_lock [\#5248](https://github.com/chef/chef/pull/5248) ([lamont-granquist](https://github.com/lamont-granquist))
 - Allow flagging a resource property as sensitive [\#5185](https://github.com/chef/chef/pull/5185) ([adamleff](https://github.com/adamleff))
-- Don't force chef-acceptance to use a specific availability zone [\#5247](https://github.com/chef/chef/pull/5247) ([jkeiser](https://github.com/jkeiser))
-- Update all the things [\#5240](https://github.com/chef/chef/pull/5240) ([jkeiser](https://github.com/jkeiser))
 - Rewrite linux useradd provider [\#5243](https://github.com/chef/chef/pull/5243) ([lamont-granquist](https://github.com/lamont-granquist))
 - Create and delete yum repositories [\#5187](https://github.com/chef/chef/pull/5187) ([thommay](https://github.com/thommay))
-- fix the useradd test filters [\#5236](https://github.com/chef/chef/pull/5236) ([lamont-granquist](https://github.com/lamont-granquist))
 - Verify systemd\_unit file during create [\#5210](https://github.com/chef/chef/pull/5210) ([mal](https://github.com/mal))
 - Add a warning for guard blocks that return a non-empty string [\#5233](https://github.com/chef/chef/pull/5233) ([coderanger](https://github.com/coderanger))
-- Remove old .kitchen.yml file [\#5181](https://github.com/chef/chef/pull/5181) ([tas50](https://github.com/tas50))
 - Forward package cookbook\_name to underlying remote\_file [\#5128](https://github.com/chef/chef/pull/5128) ([Annih](https://github.com/Annih))
-- fixed CHEF-2205 so fix the func test [\#5232](https://github.com/chef/chef/pull/5232) ([lamont-granquist](https://github.com/lamont-granquist))
-- Add monkey patch to fix bundle locks for platforms [\#5225](https://github.com/chef/chef/pull/5225) ([mwrock](https://github.com/mwrock))
-- fix omnibus test breaks [\#5231](https://github.com/chef/chef/pull/5231) ([lamont-granquist](https://github.com/lamont-granquist))
 - Fix "URI.escape is obsolete" warnings [\#5230](https://github.com/chef/chef/pull/5230) ([jkeiser](https://github.com/jkeiser))
-- Fix TinyServer races by waiting for stop\(\) and start\(\) callbacks [\#5224](https://github.com/chef/chef/pull/5224) ([jkeiser](https://github.com/jkeiser))
-- remove ruby 2.1 support [\#5220](https://github.com/chef/chef/pull/5220) ([lamont-granquist](https://github.com/lamont-granquist))
-- Stop logging "SIGQUIT is not a command" in tests [\#5223](https://github.com/chef/chef/pull/5223) ([jkeiser](https://github.com/jkeiser))
-- user provider manage\_home behavior and refactor [\#5122](https://github.com/chef/chef/pull/5122) ([lamont-granquist](https://github.com/lamont-granquist))
-- Update docs for Slack and our new release cycle [\#5179](https://github.com/chef/chef/pull/5179) ([tas50](https://github.com/tas50))
-- Fix specify members of group on suse/openbsd/solaris2/hpux [\#5152](https://github.com/chef/chef/pull/5152) ([tas50](https://github.com/tas50))
-- speed up solo test [\#5222](https://github.com/chef/chef/pull/5222) ([lamont-granquist](https://github.com/lamont-granquist))
-- fix Style/BlockDelimiters, Style/MultilineBlockLayout and 0.42.0 engine upgrade [\#5218](https://github.com/chef/chef/pull/5218) ([lamont-granquist](https://github.com/lamont-granquist))
-- Pick up the final license\_scout version [\#5219](https://github.com/chef/chef/pull/5219) ([sersut](https://github.com/sersut))
+- Remove ruby 2.1 support [\#5220](https://github.com/chef/chef/pull/5220) ([lamont-granquist](https://github.com/lamont-granquist))
+- User provider manage\_home behavior and refactor [\#5122](https://github.com/chef/chef/pull/5122) ([lamont-granquist](https://github.com/lamont-granquist))
+- Fix Style/BlockDelimiters, Style/MultilineBlockLayout and 0.42.0 engine upgrade [\#5218](https://github.com/chef/chef/pull/5218) ([lamont-granquist](https://github.com/lamont-granquist))
 - Switch from Ruby 2.1.9 to Ruby 2.3.1 [\#5190](https://github.com/chef/chef/pull/5190) ([jkeiser](https://github.com/jkeiser))
 - Update to latest chefstyle [\#5217](https://github.com/chef/chef/pull/5217) ([jkeiser](https://github.com/jkeiser))
-- Fix cookbook upload of symlinked cookbooks in Ruby 2.3 on Windows [\#5216](https://github.com/chef/chef/pull/5216) ([jkeiser](https://github.com/jkeiser))
-- Fix race where lockfile can be created but not yet acquired [\#5212](https://github.com/chef/chef/pull/5212) ([jkeiser](https://github.com/jkeiser))
-- Transitive dependency licensing information for Chef Client [\#5202](https://github.com/chef/chef/pull/5202) ([sersut](https://github.com/sersut))
-- Don't use relative\_path\_from on glob results [\#5215](https://github.com/chef/chef/pull/5215) ([jkeiser](https://github.com/jkeiser))
-- Add more cops to chefstyle enforcement [\#5196](https://github.com/chef/chef/pull/5196) ([lamont-granquist](https://github.com/lamont-granquist))
-- omit this chef-provisioning test [\#5214](https://github.com/chef/chef/pull/5214) ([lamont-granquist](https://github.com/lamont-granquist))
-- Wait until inner webrick http server is confirmed running [\#5205](https://github.com/chef/chef/pull/5205) ([mwrock](https://github.com/mwrock))
-- Changes that get Jenkins running against Ruby 2.3 [\#5211](https://github.com/chef/chef/pull/5211) ([jkeiser](https://github.com/jkeiser))
-- Clear test directory before file resource examples [\#5206](https://github.com/chef/chef/pull/5206) ([mwrock](https://github.com/mwrock))
 - Rubygems memory performance improvement [\#5203](https://github.com/chef/chef/pull/5203) ([lamont-granquist](https://github.com/lamont-granquist))
 - HTTP 1.1 keepalives for cookbook synchronization [\#5151](https://github.com/chef/chef/pull/5151) ([lamont-granquist](https://github.com/lamont-granquist))
-- Keeping static libraries previously deleted by jenkins builds [\#5194](https://github.com/chef/chef/pull/5194) ([mwrock](https://github.com/mwrock))
+
+**Fixed Bugs:**
+
+- Fixes GH-4955, allowing local gems with remote dependencies [\#5098](https://github.com/chef/chef/pull/5098) ([jyaworski](https://github.com/jyaworski))
+- Hook up the recipe\_file\_loaded event which was defined but not actually called [\#5281](https://github.com/chef/chef/pull/5281) ([coderanger](https://github.com/coderanger))
+- fix gem\_package regression in master [\#5262](https://github.com/chef/chef/pull/5262) ([lamont-granquist](https://github.com/lamont-granquist))
+- Added fix for spaces in profile identifiers [\#5159](https://github.com/chef/chef/pull/5159) ([natewalck](https://github.com/natewalck))
+- Add a hook for compat\_resource [\#5259](https://github.com/chef/chef/pull/5259) ([lamont-granquist](https://github.com/lamont-granquist))
+- Fix flush\_cache issues in yum\_package [\#5258](https://github.com/chef/chef/pull/5258) ([jaymzh](https://github.com/jaymzh))
+- Use symbols instead of strings as keys for systemd user property [\#5241](https://github.com/chef/chef/pull/5241) ([joshuamiller01](https://github.com/joshuamiller01))
+- Use upstart goal state as service status [\#5249](https://github.com/chef/chef/pull/5249) ([evan2645](https://github.com/evan2645))
+- Fix the useradd test filters [\#5236](https://github.com/chef/chef/pull/5236) ([lamont-granquist](https://github.com/lamont-granquist))
+- Fix specify members of group on suse/openbsd/solaris2/hpux [\#5152](https://github.com/chef/chef/pull/5152) ([tas50](https://github.com/tas50))
+- Fix cookbook upload of symlinked cookbooks in Ruby 2.3 on Windows [\#5216](https://github.com/chef/chef/pull/5216) ([jkeiser](https://github.com/jkeiser))
+- Don't use relative\_path\_from on glob results [\#5215](https://github.com/chef/chef/pull/5215) ([jkeiser](https://github.com/jkeiser))
 
 ## [v12.13.37](https://github.com/chef/chef/tree/v12.13.37) (2016-08-12)
 [Full Changelog](https://github.com/chef/chef/compare/v12.13.30...v12.13.37)