Merge pull request #1478 from opscode/mcquin/community-merges

chef community merges

3 files changed, 37 insertions, 0 deletions

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e055706513..9edf36be41 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -33,6 +33,32 @@
   Add an option to configure the chef-zero port (CHEF-5228)
 * [**Ricardo Signes**](https://github.com/rjbs):
   Added support for the usermod provider on OmniOS
+* [**Anand Suresh**](https://github.com/anandsuresh):
+  Only modify password when one has been specified. (CHEF-5327)
+* [**Stephan Renatus**](https://github.com/srenatus):
+  Add exception when JSON parsing fails. (CHEF-5309)
+* [**Xabier de Zuazo**](https://github.com/zuazo):
+  OK to exclude space in dependencies in metadata.rb. (CHEF-4298)
+* [**Łukasz Jagiełło**](https://github.com/ljagiello):
+  Allow cookbook names with leading underscores. (CHEF-4562)
+* [**Michael Bernstein**](https://github.com/mrb):
+  Add Code Climate badge to README.
+* [**Phil Sturgeon**](https://github.com/philsturgeon):
+  Documentation that -E is not respected by knife ssh [search]. (CHEF-4778)
+* [**kaustubh**](https://github.com/kaustubh-d):
+  Use 'guest' user on AIX for RSpec tests. (OC-9954)
+* [**Stephan Renatus**](https://github.com/srenatus):
+  Fix resource_spec.rb.
+* [**Isa Farnik**](https://github.com/curiositycasualty):
+  Add warning if host resembles winrm command and knife-windows is not present.
+* [**Sander van Harmelen**](https://github.com/svanharmelen):
+  Ensure URI compliant urls. (CHEF-5261)
+* [**Julian C. Dunn**](https://github.com/juliandunn):
+  Prevent tracing? from throwing an exception when first starting chef-shell.
+* [**Robby Dyer**](https://github.com/robbydyer):
+  Correctly detect when rpm_package does not exist in upgrade action. (CHEF-5273)
+* [**Joshua Timberman**](https://github.com/jtimberman):
+  Use Upstart provider on Ubuntu 13.10+. (CHEF-5276)
 
 * Cleaned up mount provider superclass
 * Added "knife serve" to bring up local mode as a server
diff --git a/DOC_CHANGES.md b/DOC_CHANGES.md
index 901d79d090..53bd11fd2b 100644
--- a/DOC_CHANGES.md
+++ b/DOC_CHANGES.md
@@ -93,3 +93,6 @@ http_proxy_pass "Password1"
 ````
 
 then Chef will set `ENV['http_proxy'] = "http://myself:Password1@proxy.example.org:8080"`
+
+### -E is not respected by knife ssh [search]
+knife now includes a warning in the -E/--environment option that this setting is ignored by knife searches.
diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
index fe808c06d1..fc01525b7d 100644
--- a/RELEASE_NOTES.md
+++ b/RELEASE_NOTES.md
@@ -22,3 +22,11 @@ CHEF-1761 introduced a regression for signal handling when not in daemon mode
 (see CHEF-5172). Chef will now, once again, exit immediately on SIGTERM if it
 is not in daemon mode, otherwise it will complete it's current run before
 existing.
+
+#### Ubuntu 13.10+ uses Upstart service provider.
+
+The "compatibility interface" for /etc/init.d/ is no longer used at least as of
+13.10 (per the Ubuntu wiki page). The default service provider in Chef for Ubuntu
+is C:\:\P::S::Debian, which uses /etc/init.d/service_name with the start, stop,
+etc commands to manage the script. If you are able to use the init provider just
+fine, you will need to manually override the provider back to Debian.