summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorClaire McQuin <claire@getchef.com>2014-06-12 17:34:42 -0700
committerClaire McQuin <claire@getchef.com>2014-06-12 17:37:22 -0700
commit0a06872f11c7e4753c7536f60e9b626e5245382c (patch)
tree8f8d905403e890ed15f2daa86e06dc3158ead82b
parent5c4b6bb2cb7b6d6638d07e53014b539c406a204f (diff)
downloadchef-0a06872f11c7e4753c7536f60e9b626e5245382c.tar.gz
update for merges
-rw-r--r--CHANGELOG.md2
1 files changed, 2 insertions, 0 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8c5e783bd4..4acea39b8b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -67,6 +67,8 @@
Added .project to git ignore list.
* [**Ryan Cragun**](https://github.com/ryancragun):
Support override_runlist CLI option in shef/chef-shell. (CHEF-5314)
+* [**Cam Cope**](https://github.com/ccope):
+ Fix updating user passwords on Solaris. (CHEF-5247)
* Log resource always triggers notifications (CHEF-4028)
* Prevent tracing? from throwing an exception when first starting chef-shell.