summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorsersut <serdar@opscode.com>2014-05-23 12:37:48 -0700
committersersut <serdar@opscode.com>2014-05-23 12:37:48 -0700
commit50ec55964ce19d3a8a14050be9a23c4b8990e2f0 (patch)
tree3b4df866a21e6fe75d337ada17934b0795416a22
parent9dfcd70f8982b87b02628b2e28a18d586b34cd1d (diff)
downloadmixlib-log-50ec55964ce19d3a8a14050be9a23c4b8990e2f0.tar.gz
Remove CONTRIBUTIONS.md and merge it's contents with CHANGELOG.md.
-rw-r--r--CHANGELOG.md5
-rw-r--r--CONTRIBUTIONS.md7
2 files changed, 5 insertions, 7 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9d64b56..5514658 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,4 +2,9 @@
## Unreleased
+* [**Ketan Padegaonkar**:](https://github.com/ketan)
+ Ensure that arguments to Mixlib::Log#add are passed as is to all loggers.
+* [**Greg Albrecht**:](https://github.com/ampledata)
+ Fixed RDoc formatting of README.rdoc.
+
## Last Release: 1.6.0 (04/02/2013)
diff --git a/CONTRIBUTIONS.md b/CONTRIBUTIONS.md
deleted file mode 100644
index 21260e1..0000000
--- a/CONTRIBUTIONS.md
+++ /dev/null
@@ -1,7 +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.
--->
-# mixlib-log Contributions: