summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorsersut <serdar@opscode.com>2014-03-12 15:10:10 -0700
committersersut <serdar@opscode.com>2014-03-12 15:10:10 -0700
commitce7593ee60ecace552a86ece5cd98ef8b9395bf1 (patch)
treed02a98d67066efc5b6e2c2119a8aa7894f8ca91e
parente11698c9fffb8b2bf0b39591b3b79d6890e1351d (diff)
downloadchef-ce7593ee60ecace552a86ece5cd98ef8b9395bf1.tar.gz
Info for PR 1121.
-rw-r--r--CHANGELOG.md1
-rw-r--r--CONTRIBUTIONS.md4
2 files changed, 3 insertions, 2 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9b0183a338..e271291ec7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -18,6 +18,7 @@
* CHEF-5086: Add reboot_pending? helper to DSL
* Upgrade ohai to 7.0.0.rc.0
* Make the initial bootstrap message more user friendly (CHEF-5102)
+* Correctly handle exceptions in formatters when exception.message is nil (CHEF-4743)
## Last Release: 11.10.0 (02/06/2014)
diff --git a/CONTRIBUTIONS.md b/CONTRIBUTIONS.md
index e09c96848e..537bb4fff2 100644
--- a/CONTRIBUTIONS.md
+++ b/CONTRIBUTIONS.md
@@ -7,5 +7,5 @@ Example Contribution:
# Chef Client Contributions:
* **jonlives**: Changed the order of recipe and cookbook name setting. Fixes CHEF-5052.
-* **jaymzh**: Service Provider for MacOSX now supports `enable` and `disable`
-
+* **jaymzh**: Added support for `enable` and `disable` to MacOSX service provider.
+* **bossmc**: Made formatters more resilient to nil exception messages.