diff options
| -rw-r--r-- | CHANGELOG.md | 7 | ||||
| -rw-r--r-- | Gemfile.lock | 10 | ||||
| -rw-r--r-- | VERSION | 2 | ||||
| -rw-r--r-- | chef-config/lib/chef-config/version.rb | 2 | ||||
| -rw-r--r-- | lib/chef/version.rb | 2 |
5 files changed, 12 insertions, 11 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 38e4e44dcf..8f204d9bea 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,15 +1,16 @@ <!-- usage documentation: http://expeditor-docs.es.chef.io/configuration/changelog/ --> -<!-- latest_release 14.4.35 --> -## [v14.4.35](https://github.com/chef/chef/tree/v14.4.35) (2018-08-14) +<!-- latest_release 14.4.36 --> +## [v14.4.36](https://github.com/chef/chef/tree/v14.4.36) (2018-08-14) #### Merged Pull Requests -- Add cron_d and cron_access resources [#7253](https://github.com/chef/chef/pull/7253) ([tas50](https://github.com/tas50)) +- Update to openssl 1.0.2p [#7546](https://github.com/chef/chef/pull/7546) ([tas50](https://github.com/tas50)) <!-- latest_release --> <!-- release_rollup since=14.3.37 --> ### Changes since 14.3.37 release #### Merged Pull Requests +- Update to openssl 1.0.2p [#7546](https://github.com/chef/chef/pull/7546) ([tas50](https://github.com/tas50)) <!-- 14.4.36 --> - Add cron_d and cron_access resources [#7253](https://github.com/chef/chef/pull/7253) ([tas50](https://github.com/tas50)) <!-- 14.4.35 --> - windows_package: Fix package sensitive error [#7353](https://github.com/chef/chef/pull/7353) ([dheerajd-msys](https://github.com/dheerajd-msys)) <!-- 14.4.34 --> - Require mixlib-shellout 2.4 or later [#7543](https://github.com/chef/chef/pull/7543) ([tas50](https://github.com/tas50)) <!-- 14.4.33 --> diff --git a/Gemfile.lock b/Gemfile.lock index adc7996f83..16587cec57 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -9,10 +9,10 @@ GIT PATH remote: . specs: - chef (14.4.35) + chef (14.4.36) addressable bundler (>= 1.10) - chef-config (= 14.4.35) + chef-config (= 14.4.36) chef-zero (>= 13.0) diff-lcs (~> 1.2, >= 1.2.4) erubis (~> 2.7) @@ -40,10 +40,10 @@ PATH specinfra (~> 2.10) syslog-logger (~> 1.6) uuidtools (~> 2.1.5) - chef (14.4.35-universal-mingw32) + chef (14.4.36-universal-mingw32) addressable bundler (>= 1.10) - chef-config (= 14.4.35) + chef-config (= 14.4.36) chef-zero (>= 13.0) diff-lcs (~> 1.2, >= 1.2.4) erubis (~> 2.7) @@ -86,7 +86,7 @@ PATH PATH remote: chef-config specs: - chef-config (14.4.35) + chef-config (14.4.36) addressable fuzzyurl mixlib-config (>= 2.2.12, < 3.0) @@ -1 +1 @@ -14.4.35
\ No newline at end of file +14.4.36
\ No newline at end of file diff --git a/chef-config/lib/chef-config/version.rb b/chef-config/lib/chef-config/version.rb index 1fb2f47c6c..a988a48ecd 100644 --- a/chef-config/lib/chef-config/version.rb +++ b/chef-config/lib/chef-config/version.rb @@ -21,7 +21,7 @@ module ChefConfig CHEFCONFIG_ROOT = File.expand_path("../..", __FILE__) - VERSION = "14.4.35".freeze + VERSION = "14.4.36".freeze end # diff --git a/lib/chef/version.rb b/lib/chef/version.rb index 6929609458..cc827d4b96 100644 --- a/lib/chef/version.rb +++ b/lib/chef/version.rb @@ -23,7 +23,7 @@ require "chef/version_string" class Chef CHEF_ROOT = File.expand_path("../..", __FILE__) - VERSION = Chef::VersionString.new("14.4.35") + VERSION = Chef::VersionString.new("14.4.36") end # |