Bump version to 15.4.0 by Chef Expeditorv15.4.0

Obvious fix; these changes are the result of automation not creative thinking.

6 files changed, 15 insertions, 14 deletions

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2d0d826403..495d207594 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,15 +1,16 @@
 <!-- usage documentation: http://expeditor-docs.es.chef.io/configuration/changelog/ -->
-<!-- latest_release 15.3.9 -->
-## [v15.3.9](https://github.com/chef/chef/tree/v15.3.9) (2019-09-10)
+<!-- latest_release 15.4.0 -->
+## [v15.4.0](https://github.com/chef/chef/tree/v15.4.0) (2019-09-10)
 
 #### Merged Pull Requests
-- Add mac_user resource that is compatible with macOS &gt;= 10.14 [#8775](https://github.com/chef/chef/pull/8775) ([ryancragun](https://github.com/ryancragun))
+- Update Ruby to 2.6.4 and nokogori to 10.10.4 to resolve CVEs [#8851](https://github.com/chef/chef/pull/8851) ([tas50](https://github.com/tas50))
 <!-- latest_release -->
 
 <!-- release_rollup since=15.2.20 -->
 ### Changes not yet released to stable
 
 #### Merged Pull Requests
+- Update Ruby to 2.6.4 and nokogori to 10.10.4 to resolve CVEs [#8851](https://github.com/chef/chef/pull/8851) ([tas50](https://github.com/tas50)) <!-- 15.4.0 -->
 - Add mac_user resource that is compatible with macOS &gt;= 10.14 [#8775](https://github.com/chef/chef/pull/8775) ([ryancragun](https://github.com/ryancragun)) <!-- 15.3.9 -->
 - Support to provide --local flag to gem installer. [#8847](https://github.com/chef/chef/pull/8847) ([samshinde](https://github.com/samshinde)) <!-- 15.3.8 -->
 - Bootstrap: Set pty true only if required [#8816](https://github.com/chef/chef/pull/8816) ([vsingh-msys](https://github.com/vsingh-msys)) <!-- 15.3.7 -->
diff --git a/Gemfile.lock b/Gemfile.lock
index d785d159a4..f5e50e209f 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -27,11 +27,11 @@ GIT
 PATH
   remote: .
   specs:
-    chef (15.3.9)
+    chef (15.4.0)
       addressable
       bcrypt_pbkdf (~> 1.0)
       bundler (>= 1.10)
-      chef-config (= 15.3.9)
+      chef-config (= 15.4.0)
       chef-zero (>= 14.0.11)
       diff-lcs (~> 1.2, >= 1.2.4)
       ed25519 (~> 1.2)
@@ -58,11 +58,11 @@ PATH
       train-winrm
       tty-screen (~> 0.6)
       uuidtools (~> 2.1.5)
-    chef (15.3.9-universal-mingw32)
+    chef (15.4.0-universal-mingw32)
       addressable
       bcrypt_pbkdf (~> 1.0)
       bundler (>= 1.10)
-      chef-config (= 15.3.9)
+      chef-config (= 15.4.0)
       chef-zero (>= 14.0.11)
       diff-lcs (~> 1.2, >= 1.2.4)
       ed25519 (~> 1.2)
@@ -105,13 +105,13 @@ PATH
 PATH
   remote: chef-bin
   specs:
-    chef-bin (15.3.9)
-      chef (= 15.3.9)
+    chef-bin (15.4.0)
+      chef (= 15.4.0)
 
 PATH
   remote: chef-config
   specs:
-    chef-config (15.3.9)
+    chef-config (15.4.0)
       addressable
       fuzzyurl
       mixlib-config (>= 2.2.12, < 4.0)
diff --git a/VERSION b/VERSION
index c3d2ed7b5e..92edc454ca 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-15.3.9
\ No newline at end of file
+15.4.0
\ No newline at end of file
diff --git a/chef-bin/lib/chef-bin/version.rb b/chef-bin/lib/chef-bin/version.rb
index a57fdd890b..879b3dd6fe 100644
--- a/chef-bin/lib/chef-bin/version.rb
+++ b/chef-bin/lib/chef-bin/version.rb
@@ -21,7 +21,7 @@
 
 module ChefBin
   CHEFBIN_ROOT = File.expand_path("../..", __FILE__)
-  VERSION = "15.3.9".freeze
+  VERSION = "15.4.0".freeze
 end
 
 #
diff --git a/chef-config/lib/chef-config/version.rb b/chef-config/lib/chef-config/version.rb
index 12160d94c1..507fe05d87 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 = "15.3.9".freeze
+  VERSION = "15.4.0".freeze
 end
 
 #
diff --git a/lib/chef/version.rb b/lib/chef/version.rb
index 1b6e8854dc..4e8abd9c2a 100644
--- a/lib/chef/version.rb
+++ b/lib/chef/version.rb
@@ -23,7 +23,7 @@ require_relative "version_string"
 
 class Chef
   CHEF_ROOT = File.expand_path("../..", __FILE__)
-  VERSION = Chef::VersionString.new("15.3.9")
+  VERSION = Chef::VersionString.new("15.4.0")
 end
 
 #