summaryrefslogtreecommitdiff
path: root/CHANGELOG.md
diff options
context:
space:
mode:
authorChef Expeditor <chef-ci@chef.io>2019-05-06 15:49:17 +0000
committerChef Expeditor <chef-ci@chef.io>2019-05-06 15:49:17 +0000
commitea97bef6761ddfc91e44fd90b1c336f6c3ef96b6 (patch)
tree5ca8b1510c68f70729f898d2534c82d344311b30 /CHANGELOG.md
parent3cac093a91b8139fe7be8f987aa7c72c2df1af62 (diff)
downloadchef-ea97bef6761ddfc91e44fd90b1c336f6c3ef96b6.tar.gz
Bump version to 15.0.260 by Chef Expeditorv15.0.260
Obvious fix; these changes are the result of automation not creative thinking.
Diffstat (limited to 'CHANGELOG.md')
-rw-r--r--CHANGELOG.md7
1 files changed, 4 insertions, 3 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 -->