summaryrefslogtreecommitdiff
path: root/RELEASE_NOTES.md
diff options
context:
space:
mode:
authortyler-ball <tyleraball@gmail.com>2014-11-25 11:23:57 -0800
committertyler-ball <tyleraball@gmail.com>2014-11-25 11:23:57 -0800
commite3a022e7a338d550fe59be04d689e4ecf13f8569 (patch)
tree47cb6e3098527d89c5c5db5ebec19ede6b534083 /RELEASE_NOTES.md
parent868552dc9da2e122034ae7aa698dde5a9d9d5e0c (diff)
parent5c489b2fb6f10e5ba39d804524d754139e0b2dc9 (diff)
downloadchef-e3a022e7a338d550fe59be04d689e4ecf13f8569.tar.gz
Merge branch 'typofixes-vlajos-20141107' of github.com:vlajos/chef into tball/contrib-pass
Diffstat (limited to 'RELEASE_NOTES.md')
-rw-r--r--RELEASE_NOTES.md2
1 files changed, 1 insertions, 1 deletions
diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
index c20b486f43..3c4e14aec6 100644
--- a/RELEASE_NOTES.md
+++ b/RELEASE_NOTES.md
@@ -334,7 +334,7 @@ error when `client_fork false` is set.
## Interval sleep occurs before converge
When running chef-client or chef-solo at intervals, the application will perform splay and interval sleep
-before converging chef. (In previous releases, splay sleep occurred first, then convergance, then interval sleep).
+before converging chef. (In previous releases, splay sleep occurred first, then convergence, then interval sleep).
## `--dry-run` option for knife cookbook site share
"knife cookbook site share" command now accepts a new command line option `--dry-run`. When this option is specified, command