Bump version to 15.8.31 by Chef Expeditorv15.8.31

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

7 files changed, 20 insertions, 19 deletions

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 10bcf752b6..0b2202ae36 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,15 +1,16 @@
 <!-- usage documentation: http://expeditor-docs.es.chef.io/configuration/changelog/ -->
-<!-- latest_release 15.8.30 -->
-## [v15.8.30](https://github.com/chef/chef/tree/v15.8.30) (2020-03-16)
+<!-- latest_release 15.8.31 -->
+## [v15.8.31](https://github.com/chef/chef/tree/v15.8.31) (2020-03-16)
 
 #### Merged Pull Requests
-- chef_fs: Fix gsub so only file endings of .rb and .json are removed.  [#9498](https://github.com/chef/chef/pull/9498) ([tas50](https://github.com/tas50))
+- Multiple testing fixes backported from master [#9499](https://github.com/chef/chef/pull/9499) ([tas50](https://github.com/tas50))
 <!-- latest_release -->
 
 <!-- release_rollup since=15.8.23 -->
 ### Changes not yet released to stable channel
 
 #### Merged Pull Requests
+- Multiple testing fixes backported from master [#9499](https://github.com/chef/chef/pull/9499) ([tas50](https://github.com/tas50)) <!-- 15.8.31 -->
 - chef_fs: Fix gsub so only file endings of .rb and .json are removed.  [#9498](https://github.com/chef/chef/pull/9498) ([tas50](https://github.com/tas50)) <!-- 15.8.30 -->
 - Cookstyle fixes for our resources [#9495](https://github.com/chef/chef/pull/9495) ([tas50](https://github.com/tas50)) <!-- 15.8.29 -->
 - Don&#39;t require/include Mixin Shellout in freebsd_package and openbsd_package [#9497](https://github.com/chef/chef/pull/9497) ([tas50](https://github.com/tas50)) <!-- 15.8.28 -->
diff --git a/Gemfile.lock b/Gemfile.lock
index 8a36e6604c..949a7872b3 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -27,12 +27,12 @@ GIT
 PATH
   remote: .
   specs:
-    chef (15.8.30)
+    chef (15.8.31)
       addressable
       bcrypt_pbkdf (~> 1.0)
       bundler (>= 1.10)
-      chef-config (= 15.8.30)
-      chef-utils (= 15.8.30)
+      chef-config (= 15.8.31)
+      chef-utils (= 15.8.31)
       chef-zero (>= 14.0.11)
       diff-lcs (~> 1.2, >= 1.2.4)
       ed25519 (~> 1.2)
@@ -59,12 +59,12 @@ PATH
       train-winrm (>= 0.2.5)
       tty-screen (~> 0.6)
       uuidtools (~> 2.1.5)
-    chef (15.8.30-universal-mingw32)
+    chef (15.8.31-universal-mingw32)
       addressable
       bcrypt_pbkdf (~> 1.0)
       bundler (>= 1.10)
-      chef-config (= 15.8.30)
-      chef-utils (= 15.8.30)
+      chef-config (= 15.8.31)
+      chef-utils (= 15.8.31)
       chef-zero (>= 14.0.11)
       diff-lcs (~> 1.2, >= 1.2.4)
       ed25519 (~> 1.2)
@@ -107,15 +107,15 @@ PATH
 PATH
   remote: chef-bin
   specs:
-    chef-bin (15.8.30)
-      chef (= 15.8.30)
+    chef-bin (15.8.31)
+      chef (= 15.8.31)
 
 PATH
   remote: chef-config
   specs:
-    chef-config (15.8.30)
+    chef-config (15.8.31)
       addressable
-      chef-utils (= 15.8.30)
+      chef-utils (= 15.8.31)
       fuzzyurl
       mixlib-config (>= 2.2.12, < 4.0)
       mixlib-shellout (>= 2.0, < 4.0)
@@ -124,7 +124,7 @@ PATH
 PATH
   remote: chef-utils
   specs:
-    chef-utils (15.8.30)
+    chef-utils (15.8.31)
 
 GEM
   remote: https://rubygems.org/
diff --git a/VERSION b/VERSION
index aeddc5517f..18447c49ac 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-15.8.30
\ No newline at end of file
+15.8.31
\ 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 a12dc6365b..32d98817f5 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.8.30".freeze
+  VERSION = "15.8.31".freeze
 end
 
 #
diff --git a/chef-config/lib/chef-config/version.rb b/chef-config/lib/chef-config/version.rb
index e89f39791d..f7effac5c1 100644
--- a/chef-config/lib/chef-config/version.rb
+++ b/chef-config/lib/chef-config/version.rb
@@ -15,5 +15,5 @@
 
 module ChefConfig
   CHEFCONFIG_ROOT = File.expand_path("../..", __FILE__)
-  VERSION = "15.8.30".freeze
+  VERSION = "15.8.31".freeze
 end
diff --git a/chef-utils/lib/chef-utils/version.rb b/chef-utils/lib/chef-utils/version.rb
index 4f73a6010d..2be65b1767 100644
--- a/chef-utils/lib/chef-utils/version.rb
+++ b/chef-utils/lib/chef-utils/version.rb
@@ -15,5 +15,5 @@
 
 module ChefUtils
   CHEFUTILS_ROOT = File.expand_path("../..", __FILE__)
-  VERSION = "15.8.30".freeze
+  VERSION = "15.8.31".freeze
 end
diff --git a/lib/chef/version.rb b/lib/chef/version.rb
index 3490d56860..9942c3fe8d 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.8.30")
+  VERSION = Chef::VersionString.new("15.8.31")
 end
 
 #