summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThom May <thom@chef.io>2015-04-21 12:08:51 +0100
committerThom May <thom@chef.io>2015-04-21 12:08:51 +0100
commit7bf29aea7f19ddd685fee3db6cd7b9bdd506aa2d (patch)
tree2d0ee396ff33a5433a315809d01459e6abe9181e
parent4ef31e1c63f02d695fa6f7c8ec3f6cdef0502e1a (diff)
downloadchef-7bf29aea7f19ddd685fee3db6cd7b9bdd506aa2d.tar.gz
Document changes from merges
-rw-r--r--CHANGELOG.md6
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