From a0f8c4c08350f1c8f1040766b51c03acb6ffaba7 Mon Sep 17 00:00:00 2001 From: Chef Expeditor Date: Tue, 10 Jul 2018 18:11:50 +0000 Subject: Bump version to 14.3.36 by Chef Expeditor --- CHANGELOG.md | 6 ++++-- Gemfile.lock | 10 +++++----- VERSION | 2 +- chef-config/lib/chef-config/version.rb | 2 +- lib/chef/version.rb | 2 +- 5 files changed, 12 insertions(+), 10 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 90f125ccbd..eec0d3a6d0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,8 +1,9 @@ - -## Unreleased + +## [v14.3.36](https://github.com/chef/chef/tree/v14.3.36) (2018-07-10) #### Merged Pull Requests +- Add missing descriptions and add periods after resource the descriptions [#7444](https://github.com/chef/chef/pull/7444) ([tas50](https://github.com/tas50)) - Enable Amazon Linux 2.0 tests again [#7442](https://github.com/chef/chef/pull/7442) ([tas50](https://github.com/tas50)) @@ -10,6 +11,7 @@ ### Changes since 14.2.0 release #### Merged Pull Requests +- Add missing descriptions and add periods after resource the descriptions [#7444](https://github.com/chef/chef/pull/7444) ([tas50](https://github.com/tas50)) - Enable Amazon Linux 2.0 tests again [#7442](https://github.com/chef/chef/pull/7442) ([tas50](https://github.com/tas50)) - Bump Ohai to 14.3.0 [#7437](https://github.com/chef/chef/pull/7437) ([tas50](https://github.com/tas50)) - Prevent failures using windows_feature due to the platform helper [#7433](https://github.com/chef/chef/pull/7433) ([tas50](https://github.com/tas50)) diff --git a/Gemfile.lock b/Gemfile.lock index 01114cb99f..4908d3c611 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -9,10 +9,10 @@ GIT PATH remote: . specs: - chef (14.3.35) + chef (14.3.36) addressable bundler (>= 1.10) - chef-config (= 14.3.35) + chef-config (= 14.3.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.3.35-universal-mingw32) + chef (14.3.36-universal-mingw32) addressable bundler (>= 1.10) - chef-config (= 14.3.35) + chef-config (= 14.3.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.3.35) + chef-config (14.3.36) addressable fuzzyurl mixlib-config (>= 2.2.12, < 3.0) diff --git a/VERSION b/VERSION index a06b29ff6b..3251b813cc 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -14.3.35 \ No newline at end of file +14.3.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 41b15d0590..e2a7a00dfd 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.3.35".freeze + VERSION = "14.3.36".freeze end # diff --git a/lib/chef/version.rb b/lib/chef/version.rb index 99b8b7e4ae..1c2f9be5a7 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.3.35") + VERSION = Chef::VersionString.new("14.3.36") end # -- cgit v1.2.1