diff options
| author | Claire McQuin <claire@getchef.com> | 2014-08-15 10:01:33 -0700 |
|---|---|---|
| committer | Claire McQuin <claire@getchef.com> | 2014-08-15 10:01:33 -0700 |
| commit | 04c0dc71fe5ff06be8bd400b6aa86c4981b4cef7 (patch) | |
| tree | 6eec2973d57de6a184645f93a05a7d48528d7238 /CHANGELOG.md | |
| parent | 8f87b41a9961cfb922d4bebc0575b21eed26a7f4 (diff) | |
| parent | 5d8c48de6cf44c6360865d125f31ef0897c02259 (diff) | |
| download | chef-04c0dc71fe5ff06be8bd400b6aa86c4981b4cef7.tar.gz | |
Merge branch 'master' into mcquin/Issues-1518
Conflicts:
CHANGELOG.md
Diffstat (limited to 'CHANGELOG.md')
| -rw-r--r-- | CHANGELOG.md | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index c343c8f142..6a0fbe7f85 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,6 +10,9 @@ Remove the unused StreamingCookbookUploader class (CHEF-4586) +* http_proxy and related config vars no longer clobber already set ENV vars +* all http_proxy configs now set lowercase + uppercase versions of ENV vars +* https_proxy/ftp_proxy support setting `http://` URLs (and whatever mix and match makes sense) * log resource now marks itself as supporting why-run * http_request no longer appends "?message=" query string to GET and HEAD requests * added shell_out commands directly to the recipe DSL @@ -28,6 +31,9 @@ * Fix SuSE package removal failure (Issue 1732). * Enable Travis to run Test Kitchen with Kitchen EC2. * End-to-end tests for Ubuntu 12.04 +* Only run end-to-end tests when secure environment variables are present. +* Remove recipe DSL from base provisioner (Issue 1446). +* Enable client-side key generation by default. (Issue 1711) * CookbookSiteStreamingUploader now uses ssl_verify_mode config option (Issue 1518). |