diff options
| author | Chef Expeditor <eng-services-ops+chef-ci@chef.io> | 2018-03-07 18:37:15 +0000 |
|---|---|---|
| committer | Chef Expeditor <eng-services-ops+chef-ci@chef.io> | 2018-03-07 18:37:15 +0000 |
| commit | af0f3fc9d2b9b35ad06647bf11cba0dea12cc517 (patch) | |
| tree | 239afd2e40948041c2f775557764621500334b57 | |
| parent | 430519ea74ab1b76e1d385a4d26e04c1ac1fad4e (diff) | |
| download | chef-af0f3fc9d2b9b35ad06647bf11cba0dea12cc517.tar.gz | |
Bump version to 13.8.5 by Expeditorv13.8.5
| -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 43eb42b723..412e16bc5a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,15 +1,16 @@ <!-- usage documentation: http://expeditor-docs.es.chef.io/configuration/changelog/ --> -<!-- latest_release 13.8.4 --> -## [v13.8.4](https://github.com/chef/chef/tree/v13.8.4) (2018-03-05) +<!-- latest_release 13.8.5 --> +## [v13.8.5](https://github.com/chef/chef/tree/v13.8.5) (2018-03-07) #### Merged Pull Requests -- [knife] Don't crash when a deprecated cookbook has no replacement (#6853) [#6936](https://github.com/chef/chef/pull/6936) ([tas50](https://github.com/tas50)) +- lock ffi at 1.9.21 [#6960](https://github.com/chef/chef/pull/6960) ([thommay](https://github.com/thommay)) <!-- latest_release --> <!-- release_rollup since=13.8.3 --> ### Changes since 13.8.3 release #### Merged Pull Requests +- lock ffi at 1.9.21 [#6960](https://github.com/chef/chef/pull/6960) ([thommay](https://github.com/thommay)) <!-- 13.8.5 --> - [knife] Don't crash when a deprecated cookbook has no replacement (#6853) [#6936](https://github.com/chef/chef/pull/6936) ([tas50](https://github.com/tas50)) <!-- 13.8.4 --> <!-- release_rollup --> diff --git a/Gemfile.lock b/Gemfile.lock index cd338d69ec..fe446b3e1b 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -9,10 +9,10 @@ GIT PATH remote: . specs: - chef (13.8.4) + chef (13.8.5) addressable bundler (>= 1.10) - chef-config (= 13.8.4) + chef-config (= 13.8.5) chef-zero (>= 13.0) diff-lcs (~> 1.2, >= 1.2.4) erubis (~> 2.7) @@ -39,10 +39,10 @@ PATH specinfra (~> 2.10) syslog-logger (~> 1.6) uuidtools (~> 2.1.5) - chef (13.8.4-universal-mingw32) + chef (13.8.5-universal-mingw32) addressable bundler (>= 1.10) - chef-config (= 13.8.4) + chef-config (= 13.8.5) chef-zero (>= 13.0) diff-lcs (~> 1.2, >= 1.2.4) erubis (~> 2.7) @@ -84,7 +84,7 @@ PATH PATH remote: chef-config specs: - chef-config (13.8.4) + chef-config (13.8.5) addressable fuzzyurl mixlib-config (~> 2.0) @@ -1 +1 @@ -13.8.4
\ No newline at end of file +13.8.5
\ 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 8e955d4052..563dcca2ab 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.8.4" + VERSION = "13.8.5" end # diff --git a/lib/chef/version.rb b/lib/chef/version.rb index 3db285ffd1..306af48927 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.8.4") + VERSION = Chef::VersionString.new("13.8.5") end # |