summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorClaire McQuin <claire@getchef.com>2014-06-17 17:36:25 -0700
committerClaire McQuin <claire@getchef.com>2014-06-17 17:36:25 -0700
commitadeaa9dbd65c2ab9deeb2ddf46e409aa5393c5f4 (patch)
treee24e9254f13a794a7df1749e1b4a4fc0f776d0ad
parent3b558b5255b80741050573729affc835a14bf25d (diff)
downloadchef-adeaa9dbd65c2ab9deeb2ddf46e409aa5393c5f4.tar.gz
update for merges
-rw-r--r--CHANGELOG.md6
1 files changed, 6 insertions, 0 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1e1a090044..d1b49e988a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -73,6 +73,12 @@
Enable storage of roles in subdirectories for chef-solo. (CHEF-4193)
* [**Robert Tarrall**](https://github.com/tarrall):
Fix Upstart provider with parameters. (CHEF-5265)
+* [**Klaas Jan Wierenga**](https://github.com/kjwierenga):
+ Don't pass on default HTTP port(80) in Host header. (CHEF-5355)
+* [**MarkGibbons**](https://github.com/MarkGibbons):
+ Allow for undefined solaris services in the service resource. (CHEF-5347)
+* [**Allan Espinosa**](https://github.com/aespinosa):
+ Properly knife bootstrap on ArchLinux. (CHEF-5366)
* Log resource always triggers notifications (CHEF-4028)
* Prevent tracing? from throwing an exception when first starting chef-shell.