diff options
-rw-r--r-- | CHANGELOG.md | 12 | ||||
-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, 18 insertions, 10 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index ac0bca0ad6..1101c9f056 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,7 +1,14 @@ This changelog reflects the current state of chef's master branch on github and may not reflect the current released version of chef, which is [![Gem Version](https://badge.fury.io/rb/chef.svg)](https://badge.fury.io/rb/chef). -## [v13.2.4](https://github.com/chef/chef/tree/v13.2.4) (2017-06-01) -[Full Changelog](https://github.com/chef/chef/compare/v13.0.118...v13.2.4) +## [v13.2.5](https://github.com/chef/chef/tree/v13.2.5) (2017-06-02) +[Full Changelog](https://github.com/chef/chef/compare/v13.2.5...v13.2.5) + +**Merged pull requests:** + +- \[MSYS-563\] Modified error message to explain connectivity issue due to Proxy [\#6142](https://github.com/chef/chef/pull/6142) ([NimishaS](https://github.com/NimishaS)) + +## [v13.2.5](https://github.com/chef/chef/tree/v13.2.5) (2017-06-02) +[Full Changelog](https://github.com/chef/chef/compare/v13.0.118...v13.2.5) **Closed issues:** @@ -19,6 +26,7 @@ This changelog reflects the current state of chef's master branch on github and - Fixing broken functional test in windows\_task resource [\#6139](https://github.com/chef/chef/pull/6139) ([NimishaS](https://github.com/NimishaS)) - Discard caches for files not in the manifest [\#6129](https://github.com/chef/chef/pull/6129) ([akitada](https://github.com/akitada)) - User on Windows with group incorrectly warns about passing GID [\#6125](https://github.com/chef/chef/pull/6125) ([harikesh-kolekar](https://github.com/harikesh-kolekar)) +- reconfigure between runs when running in a loop [\#6122](https://github.com/chef/chef/pull/6122) ([btm](https://github.com/btm)) - Update windows\_task to fix day validation with monthly frequency [\#6105](https://github.com/chef/chef/pull/6105) ([Stromweld](https://github.com/Stromweld)) - cab\_package should compare package name and version [\#6100](https://github.com/chef/chef/pull/6100) ([smurawski](https://github.com/smurawski)) - Fix manage\_home on AIX [\#6097](https://github.com/chef/chef/pull/6097) ([thommay](https://github.com/thommay)) diff --git a/Gemfile.lock b/Gemfile.lock index a2ce378ef3..79b79b7be6 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -30,10 +30,10 @@ GIT PATH remote: . specs: - chef (13.2.5) + chef (13.2.6) addressable bundler (>= 1.10) - chef-config (= 13.2.5) + chef-config (= 13.2.6) chef-zero (>= 13.0) diff-lcs (~> 1.2, >= 1.2.4) erubis (~> 2.7) @@ -60,10 +60,10 @@ PATH specinfra (~> 2.10) syslog-logger (~> 1.6) uuidtools (~> 2.1.5) - chef (13.2.5-universal-mingw32) + chef (13.2.6-universal-mingw32) addressable bundler (>= 1.10) - chef-config (= 13.2.5) + chef-config (= 13.2.6) chef-zero (>= 13.0) diff-lcs (~> 1.2, >= 1.2.4) erubis (~> 2.7) @@ -105,7 +105,7 @@ PATH PATH remote: chef-config specs: - chef-config (13.2.5) + chef-config (13.2.6) addressable fuzzyurl mixlib-config (~> 2.0) @@ -1 +1 @@ -13.2.5
\ No newline at end of file +13.2.6
\ 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 e96b126ab9..67be5df530 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 = "13.2.5" + VERSION = "13.2.6" end # diff --git a/lib/chef/version.rb b/lib/chef/version.rb index 845394a285..4b5e2988fe 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("13.2.5") + VERSION = Chef::VersionString.new("13.2.6") end # |