Merge pull request #1480 from opscode/mcquin/merges-06-10-2014

update for merges

2 files changed, 11 insertions, 0 deletions

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a76f2848ca..d7af397819 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -57,6 +57,14 @@
   Correctly detect when rpm_package does not exist in upgrade action. (CHEF-5273)
 * [**Sergey Sergeev**](https://github.com/zhirafovod):
   Hide sensitive data output on chef-client error (CHEF-5098)
+* [**Mark Vanderwiel**](https://github.com/kramvan1):
+  Add config option :yum-lock-timeout for yum-dump.py
+* [**Peter Fern**](https://github.com/pdf):
+  Convert APT package resource to use `provides :package`, add timeout parameter.
+* [**Xabier de Zuazo**](https://github.com/zuazo):
+  Fix Chef::User#list API error when inflate=true. (CHEF-5328)
+* [**Raphaël Valyi**](https://github.com/rvalyi):
+  Use git resource status checking to reduce shell_out system calls.
 
 * Log resource always triggers notifications (CHEF-4028)
 * Prevent tracing? from throwing an exception when first starting chef-shell.
diff --git a/DOC_CHANGES.md b/DOC_CHANGES.md
index 53bd11fd2b..0660e9a38d 100644
--- a/DOC_CHANGES.md
+++ b/DOC_CHANGES.md
@@ -96,3 +96,6 @@ then Chef will set `ENV['http_proxy'] = "http://myself:Password1@proxy.example.o
 
 ### -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.
+
+### New configurable option :yum-lock-timeout
+You can now set the timeout for receiving the yum lock in `config.rb` by adding `yum-lock-timeout SECONDS` (default is 30 seconds).