diff options
| author | Chef Expeditor <eng-services-ops+chef-ci@chef.io> | 2018-08-08 17:29:15 +0000 |
|---|---|---|
| committer | Chef Expeditor <eng-services-ops+chef-ci@chef.io> | 2018-08-08 17:29:15 +0000 |
| commit | 531a383743f1b1989dcef03c3e52c09301957ddf (patch) | |
| tree | 6891deec8e555e40b4b93c7f602f5eb95121977d | |
| parent | 40ca707abee010a212e7f9adc18aa15d19b4bea8 (diff) | |
| download | ohai-531a383743f1b1989dcef03c3e52c09301957ddf.tar.gz | |
Bump version to 14.3.6 by Chef Expeditorv14.3.6
| -rw-r--r-- | CHANGELOG.md | 7 | ||||
| -rw-r--r-- | VERSION | 2 | ||||
| -rw-r--r-- | lib/ohai/version.rb | 2 |
3 files changed, 6 insertions, 5 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 6ca36d6c..0f3a8813 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,16 +1,17 @@ # Change Log -<!-- latest_release 14.3.5 --> -## [v14.3.5](https://github.com/chef/ohai/tree/v14.3.5) (2018-08-07) +<!-- latest_release 14.3.6 --> +## [v14.3.6](https://github.com/chef/ohai/tree/v14.3.6) (2018-08-08) #### Merged Pull Requests -- Add support for passing multiple plugin directories on CLI/client.rb [#1221](https://github.com/chef/ohai/pull/1221) ([tas50](https://github.com/tas50)) +- Make the default shell_out timeout of 30 seconds configurable [#1227](https://github.com/chef/ohai/pull/1227) ([WheresAlice](https://github.com/WheresAlice)) <!-- latest_release --> <!-- release_rollup since=14.3.0 --> ### Changes since 14.3.0 release #### Merged Pull Requests +- Make the default shell_out timeout of 30 seconds configurable [#1227](https://github.com/chef/ohai/pull/1227) ([WheresAlice](https://github.com/WheresAlice)) <!-- 14.3.6 --> - Add support for passing multiple plugin directories on CLI/client.rb [#1221](https://github.com/chef/ohai/pull/1221) ([tas50](https://github.com/tas50)) <!-- 14.3.5 --> - Update Expeditor to clean branches / bump minors [#1223](https://github.com/chef/ohai/pull/1223) ([tas50](https://github.com/tas50)) <!-- 14.3.4 --> - Remove the changelog generator task [#1225](https://github.com/chef/ohai/pull/1225) ([tas50](https://github.com/tas50)) <!-- 14.3.3 --> @@ -1 +1 @@ -14.3.5
\ No newline at end of file +14.3.6
\ No newline at end of file diff --git a/lib/ohai/version.rb b/lib/ohai/version.rb index c93560f5..f4f8830a 100644 --- a/lib/ohai/version.rb +++ b/lib/ohai/version.rb @@ -18,5 +18,5 @@ module Ohai OHAI_ROOT = File.expand_path(File.dirname(__FILE__)) - VERSION = "14.3.5".freeze + VERSION = "14.3.6".freeze end |