diff options
| author | Chef Expeditor <eng-services-ops+chef-ci@chef.io> | 2017-10-20 01:03:38 +0000 |
|---|---|---|
| committer | Chef Expeditor <eng-services-ops+chef-ci@chef.io> | 2017-10-20 01:03:38 +0000 |
| commit | d646ef03f32874a150a09603ca09ef59abcf13f6 (patch) | |
| tree | 6f4d85a0faa3ebad91d8fed277fd4f4bbc68f584 | |
| parent | 5e8d5d0deda818520ce31fc76f0e96b805633431 (diff) | |
| download | chef-d646ef03f32874a150a09603ca09ef59abcf13f6.tar.gz | |
Bump version to 13.5.25 by Expeditorv13.5.25
| -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 ccba93b6b5..1e6bfeb0c9 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.24 --> -## [v13.5.24](https://github.com/chef/chef/tree/v13.5.24) (2017-10-19) +<!-- latest_release 13.5.25 --> +## [v13.5.25](https://github.com/chef/chef/tree/v13.5.25) (2017-10-20) #### Merged Pull Requests -- Fix remote_file with UNC paths failing [#6510](https://github.com/chef/chef/pull/6510) ([tas50](https://github.com/tas50)) +- Deprecate the deploy resource and family [#6468](https://github.com/chef/chef/pull/6468) ([coderanger](https://github.com/coderanger)) <!-- latest_release --> <!-- release_rollup since=13.5.3 --> ### Changes since 13.5.3 release #### Merged Pull Requests +- Deprecate the deploy resource and family [#6468](https://github.com/chef/chef/pull/6468) ([coderanger](https://github.com/coderanger)) <!-- 13.5.25 --> - Fix remote_file with UNC paths failing [#6510](https://github.com/chef/chef/pull/6510) ([tas50](https://github.com/tas50)) <!-- 13.5.24 --> - Bump dependencies to pull in new InSpec [#6511](https://github.com/chef/chef/pull/6511) ([adamleff](https://github.com/adamleff)) <!-- 13.5.23 --> - [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 --> diff --git a/Gemfile.lock b/Gemfile.lock index edf33ddfa6..c868e9abf1 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -17,10 +17,10 @@ GIT PATH remote: . specs: - chef (13.5.24) + chef (13.5.25) addressable bundler (>= 1.10) - chef-config (= 13.5.24) + chef-config (= 13.5.25) 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.24-universal-mingw32) + chef (13.5.25-universal-mingw32) addressable bundler (>= 1.10) - chef-config (= 13.5.24) + chef-config (= 13.5.25) 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.24) + chef-config (13.5.25) addressable fuzzyurl mixlib-config (~> 2.0) @@ -1 +1 @@ -13.5.24
\ No newline at end of file +13.5.25
\ 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 91e075d2ef..01ec2352b2 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.24" + VERSION = "13.5.25" end # diff --git a/lib/chef/version.rb b/lib/chef/version.rb index c0fb2a6611..e4e21ac871 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.24") + VERSION = Chef::VersionString.new("13.5.25") end # |