diff options
author | Chef Expeditor <eng-services-ops+chef-ci@chef.io> | 2017-10-11 16:13:26 +0000 |
---|---|---|
committer | Chef Expeditor <eng-services-ops+chef-ci@chef.io> | 2017-10-11 16:13:26 +0000 |
commit | 71f4a954d0fd7c9cb0a636c5503e25c7cf46e9bd (patch) | |
tree | 65e7aa95595f06a12f3d4544cf2d28ec4c004fc6 | |
parent | bd741b6128e93dc90a2943f8ca29e6b8cc378389 (diff) | |
download | chef-71f4a954d0fd7c9cb0a636c5503e25c7cf46e9bd.tar.gz |
Bump version to 13.5.18 by Chef Expeditorv13.5.18
-rw-r--r-- | CHANGELOG.md | 9 | ||||
-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, 13 insertions, 12 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 74f3a0afe7..bdbaf8941a 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.17 --> -## [v13.5.17](https://github.com/chef/chef/tree/v13.5.17) (2017-10-10) +<!-- latest_release 13.5.18 --> +## [v13.5.18](https://github.com/chef/chef/tree/v13.5.18) (2017-10-11) #### Merged Pull Requests -- Support new CriticalOhaiPlugins [#6486](https://github.com/chef/chef/pull/6486) ([jaymzh](https://github.com/jaymzh)) +- only rhel >= 8 and fedora >= 22 get dnf [#6490](https://github.com/chef/chef/pull/6490) ([lamont-granquist](https://github.com/lamont-granquist)) <!-- latest_release --> <!-- release_rollup since=13.5.3 --> ### Changes since 13.5.3 release #### Merged Pull Requests +- only rhel >= 8 and fedora >= 22 get dnf [#6490](https://github.com/chef/chef/pull/6490) ([lamont-granquist](https://github.com/lamont-granquist)) <!-- 13.5.18 --> - Support new CriticalOhaiPlugins [#6486](https://github.com/chef/chef/pull/6486) ([jaymzh](https://github.com/jaymzh)) <!-- 13.5.17 --> - Sleep for another interval after handling SIGHUP [#6461](https://github.com/chef/chef/pull/6461) ([grekasius](https://github.com/grekasius)) <!-- 13.5.16 --> - Don't spin in powershell module that launches chef processes [#6481](https://github.com/chef/chef/pull/6481) ([ksubrama](https://github.com/ksubrama)) <!-- 13.5.15 --> @@ -1612,4 +1613,4 @@ of partial templates. * Fixed a bug where nested resources that inherited from Resource::LWRPBase would not share the same actions/default_action as their parent * Raise error if a guard_interpreter is specified and a block is passed to a guard (conditional) -* Allow specifying a guard_interpreter after a conditional on a resource (Fixes #1943) +* Allow specifying a guard_interpreter after a conditional on a resource (Fixes #1943)
\ No newline at end of file diff --git a/Gemfile.lock b/Gemfile.lock index 0232783879..b12b721da0 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -17,10 +17,10 @@ GIT PATH remote: . specs: - chef (13.5.17) + chef (13.5.18) addressable bundler (>= 1.10) - chef-config (= 13.5.17) + chef-config (= 13.5.18) 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.17-universal-mingw32) + chef (13.5.18-universal-mingw32) addressable bundler (>= 1.10) - chef-config (= 13.5.17) + chef-config (= 13.5.18) 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.17) + chef-config (13.5.18) addressable fuzzyurl mixlib-config (~> 2.0) @@ -1 +1 @@ -13.5.17
\ No newline at end of file +13.5.18
\ 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 0487272917..ad1b60541d 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.17" + VERSION = "13.5.18" end # diff --git a/lib/chef/version.rb b/lib/chef/version.rb index 16454557c5..2da7210d2a 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.17") + VERSION = Chef::VersionString.new("13.5.18") end # |