diff options
author | tyler-ball <tyleraball@gmail.com> | 2014-12-05 18:06:55 -0800 |
---|---|---|
committer | tyler-ball <tyleraball@gmail.com> | 2014-12-05 18:06:55 -0800 |
commit | 091001ae8d27a8a5de03af2c20905e23a8ffefb7 (patch) | |
tree | 28abfa5821f80e2090b8f89988a0bab004b710a5 /DOC_CHANGES.md | |
parent | 8a7b450cb87ef62e9f21d32c91a52accefba6ffd (diff) | |
parent | a45716b67a2168c21b166e4aab38668e9b96d856 (diff) | |
download | chef-091001ae8d27a8a5de03af2c20905e23a8ffefb7.tar.gz |
Merge branch 'master' into merging-mastermerging-master
Conflicts:
lib/chef/version.rb
Diffstat (limited to 'DOC_CHANGES.md')
-rw-r--r-- | DOC_CHANGES.md | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/DOC_CHANGES.md b/DOC_CHANGES.md index 7eb85eb894..22294a3e39 100644 --- a/DOC_CHANGES.md +++ b/DOC_CHANGES.md @@ -165,7 +165,7 @@ and receive # snip other Ubuntu nodes ] ``` -If instead you wanted all the languages data (remember, `"languages"` is only one tiny piece of information the Chef Server stores about your node), you would have `:filter_result => {"languages" => ["laguages"]}` in your search query. +If instead you wanted all the languages data (remember, `"languages"` is only one tiny piece of information the Chef Server stores about your node), you would have `:filter_result => {"languages" => ["languages"]}` in your search query. For backwards compatibility, a `partial_search` method has been added to `Chef::Search::Query` which can be used in the same way as the `partial_search` method from the [partial_search cookbook](https://supermarket.getchef.com/cookbooks/partial_search). Note that this method has been deprecated and will be removed in future versions of Chef. @@ -539,7 +539,7 @@ For the`batch` resource, the `guard_interpreter` attribute it is set to `:batch` that if a string is supplied to an `only_if` or `not_if` attribute of a `batch` resource, the 64-bit version of the Windows default command interpreter, `cmd.exe`, will be used to evaluate the guard. It also means that other features available to the guard when `guard_interpreter` is set to something other than `:default`, such as inheritance of attributes and the specification of -process architectur of the guard process (i.e. 32-bit or 64-bit process) are available by default. +process architecture of the guard process (i.e. 32-bit or 64-bit process) are available by default. In versions of Chef prior to Chef 12, the value of the attribute was `:default` by default, which means the 32-bit version of the `cmd.exe` (batch script language) shell would be used to evaluate strings supplied to guards. |