diff options
| author | Chef Expeditor <eng-services-ops+chef-ci@chef.io> | 2017-11-15 04:23:59 +0000 |
|---|---|---|
| committer | Chef Expeditor <eng-services-ops+chef-ci@chef.io> | 2017-11-15 04:23:59 +0000 |
| commit | 933ba8f363ee6f38e49461563b1bd94a32257e63 (patch) | |
| tree | 6d50bafcc167be542089699d4836800ba4486348 | |
| parent | 7902061aeafff04c3352d9ce87039980004456c5 (diff) | |
| download | chef-933ba8f363ee6f38e49461563b1bd94a32257e63.tar.gz | |
Bump version to 13.6.5 by Expeditorv13.6.5
| -rw-r--r-- | CHANGELOG.md | 12 | ||||
| -rw-r--r-- | Gemfile.lock | 14 | ||||
| -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, 20 insertions, 12 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 7641d8e706..d59053c0f9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,8 +1,16 @@ <!-- usage documentation: http://expeditor-docs.es.chef.io/configuration/changelog/ --> -<!-- latest_release --> +<!-- latest_release 13.6.5 --> +## [v13.6.5](https://github.com/chef/chef/tree/v13.6.5) (2017-11-15) + +#### Merged Pull Requests +- Add ohai_time to minimal_ohai filter [#6584](https://github.com/chef/chef/pull/6584) ([btm](https://github.com/btm)) <!-- latest_release --> -<!-- release_rollup --> +<!-- release_rollup since=13.6.4 --> +### Changes since 13.6.4 release + +#### Merged Pull Requests +- Add ohai_time to minimal_ohai filter [#6584](https://github.com/chef/chef/pull/6584) ([btm](https://github.com/btm)) <!-- 13.6.5 --> <!-- release_rollup --> <!-- latest_stable_release --> diff --git a/Gemfile.lock b/Gemfile.lock index 1669dfbfea..58e9fe8156 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -17,10 +17,10 @@ GIT PATH remote: . specs: - chef (13.6.4) + chef (13.6.5) addressable bundler (>= 1.10) - chef-config (= 13.6.4) + chef-config (= 13.6.5) 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.6.4-universal-mingw32) + chef (13.6.5-universal-mingw32) addressable bundler (>= 1.10) - chef-config (= 13.6.4) + chef-config (= 13.6.5) 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.6.4) + chef-config (13.6.5) addressable fuzzyurl mixlib-config (~> 2.0) @@ -300,7 +300,7 @@ GEM addressable (>= 2.3.5, < 2.6) faraday (~> 0.8, < 1.0) semverse (2.0.0) - serverspec (2.41.2) + serverspec (2.41.3) multi_json rspec (~> 3.0) rspec-its @@ -312,7 +312,7 @@ GEM simplecov-html (~> 0.10.0) simplecov-html (0.10.2) slop (3.6.0) - specinfra (2.72.0) + specinfra (2.72.1) net-scp net-ssh (>= 2.7, < 5.0) net-telnet @@ -1 +1 @@ -13.6.4
\ No newline at end of file +13.6.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 577bfd1bb3..736ed0e8a8 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.6.4" + VERSION = "13.6.5" end # diff --git a/lib/chef/version.rb b/lib/chef/version.rb index cab3f145d7..9cad7993bf 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.6.4") + VERSION = Chef::VersionString.new("13.6.5") end # |