summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBryan McLellan <btm@chef.io>2015-05-01 18:51:30 -0400
committerBryan McLellan <btm@chef.io>2015-05-01 18:51:30 -0400
commite2b7e4e76cd8dae088299137d991a0455d87a109 (patch)
tree3634ed6254e18add36253978289bd124cc64bad6
parentddb82fa280f5259790c7b6c7df08666a3f07b299 (diff)
downloadchef-e2b7e4e76cd8dae088299137d991a0455d87a109.tar.gz
Update CHANGELOG for merges.
Closes #2953 Closes #3155 Closes #3112, Closes #3165 Closes #3321 Closes #3278
-rw-r--r--CHANGELOG.md10
1 files changed, 9 insertions, 1 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index fed2167bf2..aff96bb8bd 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,9 +1,17 @@
## Unreleased
* [**Phil Dibowitz**](https://github.com/jaymzh):
Fix multipackage and architectures
-* [**Igor Shpakov**](https://github.com/Igorshp)
+* [**Igor Shpakov**](https://github.com/Igorshp):
Always run exception handlers
+* [**Noah Kantrowitz**](https://github.com/coderanger):
+ Cache service_resource_providers for the duration of the run. #2953
+* [**Slava Kardakov**](https://github.com/ojab):
+ Fix installation of yum packages with version constraints #3155
+* [**Dave Eddy**](https://github.com/bahamas10):
+ fix smartos_package for new "pkgin" output, fixes #3112 #3165
+* Add an integration test of chef-client with empty ENV. #3321
+* Switch over Windows builds to universal builds. #3278
* Convert bootstrap template to use sh #2877
* [Issue #3316](https://github.com/chef/chef/issues/3316) Fix idempotency issues with the `windows_package` resource
* [pr#3295](https://github.com/chef/chef/pull/3295): Stop mutating `new_resource.checksum` in file providers. Fixes some ChecksumMismatch exceptions like [issue#3168](https://github.com/chef/chef/issues/3168)