diff options
author | Chef Expeditor <expeditor@chef.io> | 2020-04-07 18:24:57 +0000 |
---|---|---|
committer | Chef Expeditor <expeditor@chef.io> | 2020-04-07 18:24:57 +0000 |
commit | dfb3c58209c9306d8b6c7976259f29faeb0dc62d (patch) | |
tree | 37898ed901e97769c427b4f6a1623d8ae3d15786 | |
parent | 0a6a4b31f89d930b34a610ddcabfafc21e4cc64a (diff) | |
download | chef-dfb3c58209c9306d8b6c7976259f29faeb0dc62d.tar.gz |
Bump version to 14.15.6 by Chef Expeditorv14.15.6
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 602146738f..b77d695969 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.5 --> -## [v14.15.5](https://github.com/chef/chef/tree/v14.15.5) (2020-04-07) +<!-- latest_release 14.15.6 --> +## [v14.15.6](https://github.com/chef/chef/tree/v14.15.6) (2020-04-07) #### Merged Pull Requests -- Fix functional tests on Windows 10 by matching less [#9620](https://github.com/chef/chef/pull/9620) ([btm](https://github.com/btm)) +- Update to the latest commits in omnibus-software legacy_ruby branch [#9621](https://github.com/chef/chef/pull/9621) ([tas50](https://github.com/tas50)) <!-- latest_release --> <!-- release_rollup since=14.14.29 --> ### Changes not yet released to stable #### Merged Pull Requests +- Update to the latest commits in omnibus-software legacy_ruby branch [#9621](https://github.com/chef/chef/pull/9621) ([tas50](https://github.com/tas50)) <!-- 14.15.6 --> - Fix functional tests on Windows 10 by matching less [#9620](https://github.com/chef/chef/pull/9620) ([btm](https://github.com/btm)) <!-- 14.15.5 --> - 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 --> diff --git a/Gemfile.lock b/Gemfile.lock index c0f3859fe6..6e70a310ae 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,10 +1,10 @@ PATH remote: . specs: - chef (14.15.5) + chef (14.15.6) addressable bundler (>= 1.10) - chef-config (= 14.15.5) + chef-config (= 14.15.6) 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.5-universal-mingw32) + chef (14.15.6-universal-mingw32) addressable bundler (>= 1.10) - chef-config (= 14.15.5) + chef-config (= 14.15.6) 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.5) + chef-config (14.15.6) addressable fuzzyurl mixlib-config (>= 2.2.12, < 4.0) @@ -1 +1 @@ -14.15.5
\ No newline at end of file +14.15.6
\ 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 f0765f6b40..d2573bdb82 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.5".freeze + VERSION = "14.15.6".freeze end # diff --git a/lib/chef/version.rb b/lib/chef/version.rb index 1b73127dd4..69d0799159 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.5") + VERSION = Chef::VersionString.new("14.15.6") end # |