Bump version to 15.4.25 by Chef Expeditorv15.4.25

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 3c0085ec80..8f739a023d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,15 +1,16 @@
 <!-- usage documentation: http://expeditor-docs.es.chef.io/configuration/changelog/ -->
-<!-- latest_release 15.4.24 -->
-## [v15.4.24](https://github.com/chef/chef/tree/v15.4.24) (2019-10-03)
+<!-- latest_release 15.4.25 -->
+## [v15.4.25](https://github.com/chef/chef/tree/v15.4.25) (2019-10-03)
 
 #### Merged Pull Requests
-- Bump inspec-core-bin to 4.17.17 [#8953](https://github.com/chef/chef/pull/8953) ([chef-expeditor[bot]](https://github.com/chef-expeditor[bot]))
+- Revert Gemfile.lock to Bundler 1.17.3 [#8956](https://github.com/chef/chef/pull/8956) ([tas50](https://github.com/tas50))
 <!-- latest_release -->
 
 <!-- release_rollup since=15.3.14 -->
 ### Changes not yet released to stable
 
 #### Merged Pull Requests
+- Revert Gemfile.lock to Bundler 1.17.3 [#8956](https://github.com/chef/chef/pull/8956) ([tas50](https://github.com/tas50)) <!-- 15.4.25 -->
 - Bump inspec-core-bin to 4.17.17 [#8953](https://github.com/chef/chef/pull/8953) ([chef-expeditor[bot]](https://github.com/chef-expeditor[bot])) <!-- 15.4.24 -->
 - Bump Ruby to 2.6.5 to address CVEs #8951 [#8952](https://github.com/chef/chef/pull/8952) ([christopher-snapp](https://github.com/christopher-snapp)) <!-- 15.4.23 -->
 - Removing sh -c wrapper around the bootstrapper command string [#8885](https://github.com/chef/chef/pull/8885) ([Nimesh-Msys](https://github.com/Nimesh-Msys)) <!-- 15.4.22 -->
diff --git a/Gemfile.lock b/Gemfile.lock
index 2a2f7ff699..ca50ba6919 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -27,11 +27,11 @@ GIT
 PATH
   remote: .
   specs:
-    chef (15.4.24)
+    chef (15.4.25)
       addressable
       bcrypt_pbkdf (~> 1.0)
       bundler (>= 1.10)
-      chef-config (= 15.4.24)
+      chef-config (= 15.4.25)
       chef-zero (>= 14.0.11)
       diff-lcs (~> 1.2, >= 1.2.4)
       ed25519 (~> 1.2)
@@ -58,11 +58,11 @@ PATH
       train-winrm (>= 0.2.5)
       tty-screen (~> 0.6)
       uuidtools (~> 2.1.5)
-    chef (15.4.24-universal-mingw32)
+    chef (15.4.25-universal-mingw32)
       addressable
       bcrypt_pbkdf (~> 1.0)
       bundler (>= 1.10)
-      chef-config (= 15.4.24)
+      chef-config (= 15.4.25)
       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.4.24)
-      chef (= 15.4.24)
+    chef-bin (15.4.25)
+      chef (= 15.4.25)
 
 PATH
   remote: chef-config
   specs:
-    chef-config (15.4.24)
+    chef-config (15.4.25)
       addressable
       fuzzyurl
       mixlib-config (>= 2.2.12, < 4.0)
diff --git a/VERSION b/VERSION
index 663923b585..e92d2c0c9d 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-15.4.24
\ No newline at end of file
+15.4.25
\ 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 5872393126..1a83ced7f7 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.4.24".freeze
+  VERSION = "15.4.25".freeze
 end
 
 #
diff --git a/chef-config/lib/chef-config/version.rb b/chef-config/lib/chef-config/version.rb
index 49ec457b71..1c704ef730 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.4.24".freeze
+  VERSION = "15.4.25".freeze
 end
 
 #
diff --git a/lib/chef/version.rb b/lib/chef/version.rb
index 7a1ac7fcce..3de46cd229 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.4.24")
+  VERSION = Chef::VersionString.new("15.4.25")
 end
 
 #