diff options
| author | sawanoboly <sawanoboriyu@higanworks.com> | 2015-04-22 02:27:10 +0900 |
|---|---|---|
| committer | sawanoboly <sawanoboriyu@higanworks.com> | 2015-04-22 02:27:10 +0900 |
| commit | d1738cc4c83b7d8b1e948599a2ce1f3d84bef533 (patch) | |
| tree | 0cb2e4bf642419c3aa20a96c7375ef9f71205023 | |
| parent | e8d917583ec42fafe50f0ceef3ba252b8fabc94f (diff) | |
| parent | 7bf29aea7f19ddd685fee3db6cd7b9bdd506aa2d (diff) | |
| download | chef-d1738cc4c83b7d8b1e948599a2ce1f3d84bef533.tar.gz | |
Merge remote-tracking branch 'upstream/master' into show_chef_version_on_shell
| -rw-r--r-- | CHANGELOG.md | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index f56d662d85..d32217f08f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,6 +12,10 @@ * [**Mike Dodge**](https://github.com/mikedodge04) MacOSX services: Load LaunchAgents as console user, adding plist and session_type options. +* [**Eric Herot**](https://github.com/eherot) + Ensure knife ssh doesn't use a non-existant field for hostname #3131 +* [**Tom Hughes**](https://github.com/tomhughes) + Ensure searches progress in the face of incomplete responses #3135 * [pr#3162](https://github.com/chef/chef/pull/3162): Add `--minimal-ohai` flag to client/solo/apply; restricts ohai to only the @@ -22,6 +26,8 @@ * Add Chef class fascade to internal structures * Convert bootstrap template to use sh #2877 * Fix nil pointer for windows event logger #3200 +* Use partial search for knife status +* Ensure chef/knife properly honours proxy config ## 12.2.1 * [Issue 3153](https://github.com/chef/chef/issues/3153): Fix bug where unset HOME would cause chef to crash |