diff options
| author | Jay Mundrawala <jdmundrawala@gmail.com> | 2015-02-27 21:15:01 -0800 |
|---|---|---|
| committer | Jay Mundrawala <jdmundrawala@gmail.com> | 2015-02-27 21:15:01 -0800 |
| commit | 2b9cc197abc74299a27328ffb5d35284a3397ce7 (patch) | |
| tree | aa89afd2de7fc6bc88f918820b85f6491164fefe | |
| parent | 91eff901bdad40f91dc5592d76fba7c927f2c03c (diff) | |
| parent | 787b7ae18dbf867660847fb7ce8aa7227c5835a4 (diff) | |
| download | chef-tball/mingw-shenanigans.tar.gz | |
Merge pull request #2995 from chef/jdm/win-service-doc-changestball/mingw-shenanigans
Update rel notes, doc changes, and changelog for windows service changes
| -rw-r--r-- | CHANGELOG.md | 1 | ||||
| -rw-r--r-- | DOC_CHANGES.md | 5 | ||||
| -rw-r--r-- | RELEASE_NOTES.md | 6 |
3 files changed, 12 insertions, 0 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 7988ba2dd6..9e44ceffa4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,7 @@ * make deploy resource attributes nillable (`symlink_before_migrate nil`) works now * mixin the LWRP attribute DSL method into Chef::Resource directly * make all LWRP attributes nillable +* windows service now has a configurable timeout ## 12.1.0 diff --git a/DOC_CHANGES.md b/DOC_CHANGES.md index cae29adb80..f824d2da30 100644 --- a/DOC_CHANGES.md +++ b/DOC_CHANGES.md @@ -78,3 +78,8 @@ validation key. The --bootstrap-vault-item, --bootstrap-vault-json, and --bootstrap-vault-file arguments have been added to knife bootstrap providing three alternative ways to set chef vault items when bootstrapping a host. + +## Windows service now has a configurable timeout + +You can now set the amount of time a chef-client run is allowed when running the provided windows service. This can be configured by +setting `windows_service.watchdog_timeout` in your `client.rb` to the number of seconds desired. The default value is 2 hours. diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md index 4d92eee671..4d0a6cc7ef 100644 --- a/RELEASE_NOTES.md +++ b/RELEASE_NOTES.md @@ -145,3 +145,9 @@ There is no support for validatorless bootstraps when the node object has been p of the process any old node or client will be deleted when doing validatorless bootstraps. The old process with the validation key still works for this use case. The setting of the run_list, environment and json attributes first via knife bootstrap should mitigate some of the need to precreate the node object by hand first. + + +## Windows service now has a configurable timeout + +You can now set the amount of time a chef-client run is allowed when running the provided windows service. This can be configured by +setting `windows_service.watchdog_timeout` in your `client.rb` to the number of seconds desired. The default value is 2 hours. |