summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorsersut <serdar@opscode.com>2014-03-12 15:20:59 -0700
committersersut <serdar@opscode.com>2014-03-12 15:20:59 -0700
commitb96ff0afec7bfae3a567c8f8203dc767df5c8983 (patch)
tree12b624974e11c3fccb4b71648e3e4cb1da8434a8
parent93e2f52c1d6de8f18e0dc4ab27898fed7906d1c5 (diff)
downloadchef-b96ff0afec7bfae3a567c8f8203dc767df5c8983.tar.gz
Info for CHEF-4929.
-rw-r--r--CHANGELOG.md1
-rw-r--r--CONTRIBUTIONS.md1
2 files changed, 2 insertions, 0 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index e271291ec7..4512b4c4ed 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -19,6 +19,7 @@
* 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)
+* Fix convergence message in deploy provider (CHEF-4929)
## Last Release: 11.10.0 (02/06/2014)
diff --git a/CONTRIBUTIONS.md b/CONTRIBUTIONS.md
index 537bb4fff2..2945dac974 100644
--- a/CONTRIBUTIONS.md
+++ b/CONTRIBUTIONS.md
@@ -9,3 +9,4 @@ Example Contribution:
* **jonlives**: Changed the order of recipe and cookbook name setting. Fixes CHEF-5052.
* **jaymzh**: Added support for `enable` and `disable` to MacOSX service provider.
* **bossmc**: Made formatters more resilient to nil exception messages.
+* **valodzka**: Fixed the convergence message in deploy provider.