Bump version to 15.0.260 by Chef Expeditorv15.0.260

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 6d255c05d0..7b2f9a2589 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,15 +1,16 @@
 <!-- usage documentation: http://expeditor-docs.es.chef.io/configuration/changelog/ -->
-<!-- latest_release 15.0.259 -->
-## [v15.0.259](https://github.com/chef/chef/tree/v15.0.259) (2019-05-04)
+<!-- latest_release 15.0.260 -->
+## [v15.0.260](https://github.com/chef/chef/tree/v15.0.260) (2019-05-06)
 
 #### Merged Pull Requests
-- Chef-15: cookbook compiler should parse only .rb files [#8456](https://github.com/chef/chef/pull/8456) ([lamont-granquist](https://github.com/lamont-granquist))
+- Resolve exceptions when running knife diff [#8459](https://github.com/chef/chef/pull/8459) ([lamont-granquist](https://github.com/lamont-granquist))
 <!-- latest_release -->
 
 <!-- release_rollup -->
 ### Changes since latest stable release
 
 #### Merged Pull Requests
+- Resolve exceptions when running knife diff [#8459](https://github.com/chef/chef/pull/8459) ([lamont-granquist](https://github.com/lamont-granquist)) <!-- 15.0.260 -->
 - Chef-15: cookbook compiler should parse only .rb files [#8456](https://github.com/chef/chef/pull/8456) ([lamont-granquist](https://github.com/lamont-granquist)) <!-- 15.0.259 -->
 - Update more brand names to current [#8454](https://github.com/chef/chef/pull/8454) ([tas50](https://github.com/tas50)) <!-- 15.0.258 -->
 - Add connstant for Chef Server and improve help messaging [#8452](https://github.com/chef/chef/pull/8452) ([tas50](https://github.com/tas50)) <!-- 15.0.257 -->
diff --git a/Gemfile.lock b/Gemfile.lock
index 867a24a686..dba355adba 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -27,11 +27,11 @@ GIT
 PATH
   remote: .
   specs:
-    chef (15.0.259)
+    chef (15.0.260)
       addressable
       bcrypt_pbkdf (~> 1.0)
       bundler (>= 1.10)
-      chef-config (= 15.0.259)
+      chef-config (= 15.0.260)
       chef-zero (>= 14.0.11)
       diff-lcs (~> 1.2, >= 1.2.4)
       ed25519 (~> 1.2)
@@ -56,11 +56,11 @@ PATH
       train-core (~> 2.0, >= 2.0.12)
       tty-screen (~> 0.6)
       uuidtools (~> 2.1.5)
-    chef (15.0.259-universal-mingw32)
+    chef (15.0.260-universal-mingw32)
       addressable
       bcrypt_pbkdf (~> 1.0)
       bundler (>= 1.10)
-      chef-config (= 15.0.259)
+      chef-config (= 15.0.260)
       chef-zero (>= 14.0.11)
       diff-lcs (~> 1.2, >= 1.2.4)
       ed25519 (~> 1.2)
@@ -101,13 +101,13 @@ PATH
 PATH
   remote: chef-bin
   specs:
-    chef-bin (15.0.259)
-      chef (= 15.0.259)
+    chef-bin (15.0.260)
+      chef (= 15.0.260)
 
 PATH
   remote: chef-config
   specs:
-    chef-config (15.0.259)
+    chef-config (15.0.260)
       addressable
       fuzzyurl
       mixlib-config (>= 2.2.12, < 4.0)
diff --git a/VERSION b/VERSION
index 3174968ebc..1256ed9d25 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-15.0.259
\ No newline at end of file
+15.0.260
\ 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 92bcea6bbe..6392b1232d 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.0.259".freeze
+  VERSION = "15.0.260".freeze
 end
 
 #
diff --git a/chef-config/lib/chef-config/version.rb b/chef-config/lib/chef-config/version.rb
index f2c0755368..3aeb807e42 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.0.259".freeze
+  VERSION = "15.0.260".freeze
 end
 
 #
diff --git a/lib/chef/version.rb b/lib/chef/version.rb
index 82e731acb2..793f70f4d9 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("15.0.259")
+  VERSION = Chef::VersionString.new("15.0.260")
 end
 
 #