summaryrefslogtreecommitdiff
path: root/DOC_CHANGES.md
diff options
context:
space:
mode:
authorClaire McQuin <claire@getchef.com>2014-06-10 16:35:42 -0700
committerClaire McQuin <claire@getchef.com>2014-06-10 16:35:42 -0700
commitc7c6c34715bda9231a42553674d72c5c6b2e05ef (patch)
tree51590f45ebded4d7d5dbcf061e670efae5895cdd /DOC_CHANGES.md
parent5029c588c722e0bd61a7478e38d9ef6dbc0f1a00 (diff)
downloadchef-c7c6c34715bda9231a42553674d72c5c6b2e05ef.tar.gz
update for merges
Diffstat (limited to 'DOC_CHANGES.md')
-rw-r--r--DOC_CHANGES.md3
1 files changed, 3 insertions, 0 deletions
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).