diff options
| author | Bryan McLellan <btm@loftninjas.org> | 2014-06-22 13:28:11 -0400 |
|---|---|---|
| committer | Bryan McLellan <btm@loftninjas.org> | 2014-06-22 13:28:11 -0400 |
| commit | d111e820f1f3dba3e759f6f06bbeac30f8aa1389 (patch) | |
| tree | e876c2597b6287b8ffc8ec7c1907e5ab5636b3e8 /CHANGELOG.md | |
| parent | 7fcc73db2150ffc25e0460907668b94dc4a351ce (diff) | |
| parent | ec30afbca5c31953975c45b2d0efde01223541cc (diff) | |
| download | chef-d111e820f1f3dba3e759f6f06bbeac30f8aa1389.tar.gz | |
Merge pull request #1530 from opscode/btm/CHEF-5158
CHEF-5158: Prefer CLI argument over configuration file setting for ssh_attribute
Diffstat (limited to 'CHANGELOG.md')
| -rw-r--r-- | CHANGELOG.md | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 8fe9920ac9..56492db8b6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -87,7 +87,8 @@ Add support for automatically using the Systemd service provider when available. (CHEF-3637) * [**Matt Hoyle**](https://github.com/deployable): Add timeout for Chef::Provider::Service::Windows. (CHEF-1165) - +* [**Jesse Hu**](https://github.com/jessehu): + knife[:attribute] in knife.rb should not override --attribute (CHEF-5158) * Update rpm provider checking regex to allow for special characters (CHEF-4893) * Allow for spaces in selinux controlled directories (CHEF-5095) |