diff options
| author | Chef Expeditor <eng-services-ops+chef-ci@chef.io> | 2017-10-17 01:43:08 +0000 |
|---|---|---|
| committer | Chef Expeditor <eng-services-ops+chef-ci@chef.io> | 2017-10-17 01:43:08 +0000 |
| commit | 25dd1d9dadb68224f600aabc7d05326acfef4d27 (patch) | |
| tree | 27decfe206b476770a1c78c74d535d3d4b0a29f1 | |
| parent | 2a7c69b0013731f3392c63de05dea6611ff2ee53 (diff) | |
| download | chef-25dd1d9dadb68224f600aabc7d05326acfef4d27.tar.gz | |
Bump version to 13.5.22 by Chef Expeditorv13.5.22
| -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 26438cfe68..f80ef1abb8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,15 +1,16 @@ <!-- usage documentation: http://expeditor-docs.es.chef.io/configuration/changelog/ --> -<!-- latest_release 13.5.21 --> -## [v13.5.21](https://github.com/chef/chef/tree/v13.5.21) (2017-10-17) +<!-- latest_release 13.5.22 --> +## [v13.5.22](https://github.com/chef/chef/tree/v13.5.22) (2017-10-17) #### Merged Pull Requests -- MSYS-684: Added parser for DSC configuration [#6473](https://github.com/chef/chef/pull/6473) ([piyushawasthi](https://github.com/piyushawasthi)) +- [MSYS-647] array support for choco pkg from artifactory [#6437](https://github.com/chef/chef/pull/6437) ([dheerajd-msys](https://github.com/dheerajd-msys)) <!-- latest_release --> <!-- release_rollup since=13.5.3 --> ### Changes since 13.5.3 release #### Merged Pull Requests +- [MSYS-647] array support for choco pkg from artifactory [#6437](https://github.com/chef/chef/pull/6437) ([dheerajd-msys](https://github.com/dheerajd-msys)) <!-- 13.5.22 --> - MSYS-684: Added parser for DSC configuration [#6473](https://github.com/chef/chef/pull/6473) ([piyushawasthi](https://github.com/piyushawasthi)) <!-- 13.5.21 --> - fix rebooter for solaris and background reboots [#6497](https://github.com/chef/chef/pull/6497) ([lamont-granquist](https://github.com/lamont-granquist)) <!-- 13.5.20 --> - Windows: Added :none frequency to windows_task resource [#6394](https://github.com/chef/chef/pull/6394) ([NAshwini](https://github.com/NAshwini)) <!-- 13.5.19 --> diff --git a/Gemfile.lock b/Gemfile.lock index 6ef15e128f..98b2a97cb6 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -17,10 +17,10 @@ GIT PATH remote: . specs: - chef (13.5.21) + chef (13.5.22) addressable bundler (>= 1.10) - chef-config (= 13.5.21) + chef-config (= 13.5.22) chef-zero (>= 13.0) diff-lcs (~> 1.2, >= 1.2.4) erubis (~> 2.7) @@ -47,10 +47,10 @@ PATH specinfra (~> 2.10) syslog-logger (~> 1.6) uuidtools (~> 2.1.5) - chef (13.5.21-universal-mingw32) + chef (13.5.22-universal-mingw32) addressable bundler (>= 1.10) - chef-config (= 13.5.21) + chef-config (= 13.5.22) chef-zero (>= 13.0) diff-lcs (~> 1.2, >= 1.2.4) erubis (~> 2.7) @@ -92,7 +92,7 @@ PATH PATH remote: chef-config specs: - chef-config (13.5.21) + chef-config (13.5.22) addressable fuzzyurl mixlib-config (~> 2.0) @@ -1 +1 @@ -13.5.21
\ No newline at end of file +13.5.22
\ 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 f22df4d6cd..c6d9a43806 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.5.21" + VERSION = "13.5.22" end # diff --git a/lib/chef/version.rb b/lib/chef/version.rb index f5a41209ea..f644d27a4c 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.5.21") + VERSION = Chef::VersionString.new("13.5.22") end # |