diff options
author | Chef Expeditor <expeditor@chef.io> | 2020-04-07 18:09:22 +0000 |
---|---|---|
committer | Chef Expeditor <expeditor@chef.io> | 2020-04-07 18:09:22 +0000 |
commit | a46d9097cc5b6b1a32951ca609fbb58ab9e1dd17 (patch) | |
tree | 7e532ed4f00496f7684ef81dea314956079f5a35 | |
parent | a24c03abc4c5906b65f26816e209427269ec3d19 (diff) | |
download | chef-a46d9097cc5b6b1a32951ca609fbb58ab9e1dd17.tar.gz |
Bump version to 14.15.4 by Chef Expeditorv14.15.4
Obvious fix; these changes are the result of automation not creative thinking.
-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 f206abe3d1..6432eb375c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,15 +1,16 @@ <!-- usage documentation: http://expeditor-docs.es.chef.io/configuration/changelog/ --> -<!-- latest_release 14.15.3 --> -## [v14.15.3](https://github.com/chef/chef/tree/v14.15.3) (2020-04-07) +<!-- latest_release 14.15.4 --> +## [v14.15.4](https://github.com/chef/chef/tree/v14.15.4) (2020-04-07) #### Merged Pull Requests -- Update to Ruby 2.5.8 + nokogiri 1.10.9 [#9617](https://github.com/chef/chef/pull/9617) ([tas50](https://github.com/tas50)) +- Update Ohai to 14.15 [#9619](https://github.com/chef/chef/pull/9619) ([tas50](https://github.com/tas50)) <!-- latest_release --> <!-- release_rollup since=14.14.29 --> ### Changes not yet released to stable #### Merged Pull Requests +- Update Ohai to 14.15 [#9619](https://github.com/chef/chef/pull/9619) ([tas50](https://github.com/tas50)) <!-- 14.15.4 --> - Update to Ruby 2.5.8 + nokogiri 1.10.9 [#9617](https://github.com/chef/chef/pull/9617) ([tas50](https://github.com/tas50)) <!-- 14.15.3 --> - 14: Really skip the reboot pending func test if a reboot is pending [#9612](https://github.com/chef/chef/pull/9612) ([btm](https://github.com/btm)) <!-- 14.15.2 --> - Backport windows_task PR #8420 and #9223 [#9601](https://github.com/chef/chef/pull/9601) ([Vasu1105](https://github.com/Vasu1105)) <!-- 14.15.0 --> diff --git a/Gemfile.lock b/Gemfile.lock index 44e222fc05..60e52c00cd 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,10 +1,10 @@ PATH remote: . specs: - chef (14.15.3) + chef (14.15.4) addressable bundler (>= 1.10) - chef-config (= 14.15.3) + chef-config (= 14.15.4) chef-zero (>= 13.0, < 15.0) diff-lcs (~> 1.2, >= 1.2.4) erubis (~> 2.7) @@ -31,10 +31,10 @@ PATH specinfra (~> 2.10) syslog-logger (~> 1.6) uuidtools (~> 2.1.5) - chef (14.15.3-universal-mingw32) + chef (14.15.4-universal-mingw32) addressable bundler (>= 1.10) - chef-config (= 14.15.3) + chef-config (= 14.15.4) chef-zero (>= 13.0, < 15.0) diff-lcs (~> 1.2, >= 1.2.4) erubis (~> 2.7) @@ -77,7 +77,7 @@ PATH PATH remote: chef-config specs: - chef-config (14.15.3) + chef-config (14.15.4) addressable fuzzyurl mixlib-config (>= 2.2.12, < 4.0) @@ -1 +1 @@ -14.15.3
\ No newline at end of file +14.15.4
\ 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 16d6a2a2b7..8c270f48dc 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 = "14.15.3".freeze + VERSION = "14.15.4".freeze end # diff --git a/lib/chef/version.rb b/lib/chef/version.rb index 09f0f1dc87..52dc0660da 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("14.15.3") + VERSION = Chef::VersionString.new("14.15.4") end # |