summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChef Expeditor <expeditor@chef.io>2020-04-07 18:14:59 +0000
committerChef Expeditor <expeditor@chef.io>2020-04-07 18:14:59 +0000
commit338c79061dc209c90e5728d754b2676f1c6dc4a4 (patch)
tree0e39bf630bb51dc676e5c9977aa04f641497c237
parent0544a6c3715748086e3b816ed9d9b499930fdee0 (diff)
downloadchef-338c79061dc209c90e5728d754b2676f1c6dc4a4.tar.gz
Bump version to 14.15.5 by Chef Expeditorv14.15.5
Obvious fix; these changes are the result of automation not creative thinking.
-rw-r--r--CHANGELOG.md7
-rw-r--r--Gemfile.lock10
-rw-r--r--VERSION2
-rw-r--r--chef-config/lib/chef-config/version.rb2
-rw-r--r--lib/chef/version.rb2
5 files changed, 12 insertions, 11 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6432eb375c..602146738f 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.4 -->
-## [v14.15.4](https://github.com/chef/chef/tree/v14.15.4) (2020-04-07)
+<!-- latest_release 14.15.5 -->
+## [v14.15.5](https://github.com/chef/chef/tree/v14.15.5) (2020-04-07)
#### Merged Pull Requests
-- Update Ohai to 14.15 [#9619](https://github.com/chef/chef/pull/9619) ([tas50](https://github.com/tas50))
+- Fix functional tests on Windows 10 by matching less [#9620](https://github.com/chef/chef/pull/9620) ([btm](https://github.com/btm))
<!-- latest_release -->
<!-- release_rollup since=14.14.29 -->
### Changes not yet released to stable
#### 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)) <!-- 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 -->
- 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 -->
diff --git a/Gemfile.lock b/Gemfile.lock
index 60e52c00cd..c0f3859fe6 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,10 +1,10 @@
PATH
remote: .
specs:
- chef (14.15.4)
+ chef (14.15.5)
addressable
bundler (>= 1.10)
- chef-config (= 14.15.4)
+ chef-config (= 14.15.5)
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.4-universal-mingw32)
+ chef (14.15.5-universal-mingw32)
addressable
bundler (>= 1.10)
- chef-config (= 14.15.4)
+ chef-config (= 14.15.5)
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.4)
+ chef-config (14.15.5)
addressable
fuzzyurl
mixlib-config (>= 2.2.12, < 4.0)
diff --git a/VERSION b/VERSION
index 47266f80f2..d4cf210a51 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-14.15.4 \ No newline at end of file
+14.15.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 8c270f48dc..f0765f6b40 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.4".freeze
+ VERSION = "14.15.5".freeze
end
#
diff --git a/lib/chef/version.rb b/lib/chef/version.rb
index 52dc0660da..1b73127dd4 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.4")
+ VERSION = Chef::VersionString.new("14.15.5")
end
#