Remove CONTRIBUTIONS.md and merge it's contents with CHANGELOG.md.

2 files changed, 23 insertions, 31 deletions

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 74c76422..a480f2a3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,20 +1,30 @@
 # Ohai Changelog
 
-## Unreleased: 7.0.2
+## Unreleased: 7.2.0
 
-* Skip v7 plugins when refreshing a v6 plugin. Fixes
-  `Ohai::Exceptions::AttributeNotFound` errors in Chef's ohai resource
-* Added platform_family support for ibm_powerkvm (OHAI-558)
-* EC2 metadata errors are unhelpful (OHAI-566)
-* Support deep virtualization systems in node[:virtualization][:systems] (OHAI-182)
-* :Passwd plugin now ignores duplicate users. (OHAI-561)
+* [**Lance Bragstad**:](https://github.com/lbragstad)
+  Added platform_family support for ibm_powerkvm (OHAI-558)
+* [**Pierre Carrier**:](https://github.com/pcarrier)
+  EC2 metadata errors are unhelpful (OHAI-566)
+* [**Elan Ruusamae**:](https://github.com/glensc)
+  Support deep virtualization systems in node[:virtualization][:systems] (OHAI-182)
+* [**Sean Walberg**:](https://github.com/swalberg)
+  :Passwd plugin now ignores duplicate users. (OHAI-561)
+* [**Joe Richards**:](https://github.com/viyh)
+  Fix warning message about constants already defined (OHAI-572)
+* [**Tim Smith**:](https://github.com/tas50)
+  Present all CPU flags on FreeBSD (OHAI-568)
+* [**Tim Smith**:](https://github.com/tas50)
+  Ohai doesn't detect all KVM processor types as KVM on FreeBSD (OHAI-575)
+* [**Tim Smith**:](https://github.com/tas50)
+  Ohai should expose mdadm raid information on Linux systems (OHAI-578)
+* [**Cam Cope**:](https://github.com/ccope)
+  relax regex to match newer Oracle Solaris releases (OHAI-563)
+* [**Vasiliy Tolstov**:](https://github.com/vtolstov)
+  add exherbo support (OHAI-570)
+
+* `Ohai::Exceptions::AttributeNotFound` errors in Chef's ohai resource
 * Be reluctant to call something an LXC host (OHAI-573)
-* Fix warning message about constants already defined (OHAI-572)
-* Present all CPU flags on FreeBSD (OHAI-568)
-* Ohai doesn't detect all KVM processor types as KVM on FreeBSD (OHAI-575)
-* Ohai should expose mdadm raid information on Linux systems (OHAI-578)
-* relax regex to match newer Oracle Solaris releases (OHAI-563)
-* add exherbo support (OHAI-570)
 
 ## Last Release: 7.0.0 (04/01/2014)
 
diff --git a/CONTRIBUTIONS.md b/CONTRIBUTIONS.md
deleted file mode 100644
index 1eadf2ff..00000000
--- a/CONTRIBUTIONS.md
+++ /dev/null
@@ -1,18 +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.
--->
-# OHAI Contributions:
-
-* **lbragstad**: Added platform\_family support for ibm\_powerkvm
-* **pcarrier**: ec2\_metadata: specify path in exception
-* **glensc**: Support deep virtualization systems
-* **swalberg**: Fixed :Passwd plugin to ignore duplicate users. (OHAI-561)
-* **viyh**: Fix warning message about constants already defined (OHAI-572)
-* **tas50**: Present all CPU flags on FreeBSD (OHAI-568)
-* **tas50**: Ohai doesn't detect all KVM processor types as KVM on FreeBSD (OHAI-575)
-* **tas50**: Ohai should expose mdadm raid information on Linux systems (OHAI-578)
-* **ccope**: relax regex to match newer Oracle Solaris releases (OHAI-563)
-* **vtolstov**: add exherbo support (OHAI-570)