From 17f5c3f141ae65a1fc47aad93d6d69004b50b3c8 Mon Sep 17 00:00:00 2001
From: Chef Expeditor <expeditor@chef.io>
Date: Sun, 3 Nov 2019 16:11:44 +0000
Subject: Bump version to 15.4.61 by Chef Expeditor

Obvious fix; these changes are the result of automation not creative thinking.
---
 CHANGELOG.md                           |  7 ++++---
 Gemfile.lock                           | 14 +++++++-------
 VERSION                                |  2 +-
 chef-bin/lib/chef-bin/version.rb       |  2 +-
 chef-config/lib/chef-config/version.rb |  2 +-
 lib/chef/version.rb                    |  2 +-
 6 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index cbd1565573..e0c2b5ac5a 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.60 -->
-## [v15.4.60](https://github.com/chef/chef/tree/v15.4.60) (2019-11-03)
+<!-- latest_release 15.4.61 -->
+## [v15.4.61](https://github.com/chef/chef/tree/v15.4.61) (2019-11-03)
 
 #### Merged Pull Requests
-- Bump omnibus to 6.1.10 [#9048](https://github.com/chef/chef/pull/9048) ([btm](https://github.com/btm))
+- [knife config get] Fix TypeError: no implicit conversion of nil into String [#9049](https://github.com/chef/chef/pull/9049) ([vsingh-msys](https://github.com/vsingh-msys))
 <!-- latest_release -->
 
 <!-- release_rollup since=15.4.45 -->
 ### Changes not yet released to stable
 
 #### Merged Pull Requests
+- [knife config get] Fix TypeError: no implicit conversion of nil into String [#9049](https://github.com/chef/chef/pull/9049) ([vsingh-msys](https://github.com/vsingh-msys)) <!-- 15.4.61 -->
 - Bump omnibus to 6.1.10 [#9048](https://github.com/chef/chef/pull/9048) ([btm](https://github.com/btm)) <!-- 15.4.60 -->
 - a Windows Habitat plan [#8900](https://github.com/chef/chef/pull/8900) ([robbkidd](https://github.com/robbkidd)) <!-- 15.4.59 -->
 - Fix multiple chefignore file issues [#8925](https://github.com/chef/chef/pull/8925) ([vsingh-msys](https://github.com/vsingh-msys)) <!-- 15.4.58 -->
diff --git a/Gemfile.lock b/Gemfile.lock
index cf7d862d3d..dd3ad9ae83 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -27,11 +27,11 @@ GIT
 PATH
   remote: .
   specs:
-    chef (15.4.60)
+    chef (15.4.61)
       addressable
       bcrypt_pbkdf (~> 1.0)
       bundler (>= 1.10)
-      chef-config (= 15.4.60)
+      chef-config (= 15.4.61)
       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.60-universal-mingw32)
+    chef (15.4.61-universal-mingw32)
       addressable
       bcrypt_pbkdf (~> 1.0)
       bundler (>= 1.10)
-      chef-config (= 15.4.60)
+      chef-config (= 15.4.61)
       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.60)
-      chef (= 15.4.60)
+    chef-bin (15.4.61)
+      chef (= 15.4.61)
 
 PATH
   remote: chef-config
   specs:
-    chef-config (15.4.60)
+    chef-config (15.4.61)
       addressable
       fuzzyurl
       mixlib-config (>= 2.2.12, < 4.0)
diff --git a/VERSION b/VERSION
index eac54a5021..59a00528f8 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-15.4.60
\ No newline at end of file
+15.4.61
\ 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 b2d1b37070..e8d5e530e9 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.60".freeze
+  VERSION = "15.4.61".freeze
 end
 
 #
diff --git a/chef-config/lib/chef-config/version.rb b/chef-config/lib/chef-config/version.rb
index 3efba8a1a8..04a62503a9 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.60".freeze
+  VERSION = "15.4.61".freeze
 end
 
 #
diff --git a/lib/chef/version.rb b/lib/chef/version.rb
index ae09ad7754..2fe3d16018 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.60")
+  VERSION = Chef::VersionString.new("15.4.61")
 end
 
 #
-- 
cgit v1.2.1