diff options
author | Claire McQuin <mcquin@users.noreply.github.com> | 2014-06-12 17:37:41 -0700 |
---|---|---|
committer | Claire McQuin <mcquin@users.noreply.github.com> | 2014-06-12 17:37:41 -0700 |
commit | ac0a8930dca1f26cbddff75741c8ff5f5f47eac7 (patch) | |
tree | 170fa14f5c015e3e890d436aad8f9d93cf9176a6 | |
parent | 690dc96357aba79ef4d4aef4cb26fe48e57a89d2 (diff) | |
parent | 0a06872f11c7e4753c7536f60e9b626e5245382c (diff) | |
download | chef-ac0a8930dca1f26cbddff75741c8ff5f5f47eac7.tar.gz |
Merge pull request #1493 from opscode/mcquin/merges-06-12-2014
update for today's merges
-rw-r--r-- | CHANGELOG.md | 2 |
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. |