summaryrefslogtreecommitdiff
path: root/CHANGELOG.md
diff options
context:
space:
mode:
authorChef Expeditor <expeditor@chef.io>2020-06-10 17:49:57 +0000
committerChef Expeditor <expeditor@chef.io>2020-06-10 17:49:57 +0000
commit1e6f64c5398ee5efddd25a1f88ec0c1e322cf59d (patch)
treea7b2debf5f081e75dd82a46a30ef3fc0f19bf7cb /CHANGELOG.md
parentbfa1e6e4eb6ef507f306df3a134a0ee233edc4d3 (diff)
downloadchef-1e6f64c5398ee5efddd25a1f88ec0c1e322cf59d.tar.gz
Bump version to 16.2.26 by Chef Expeditorv16.2.26
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 66dbfbb8b3..2cefe7e5f0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,15 +1,16 @@
<!-- usage documentation: http://expeditor-docs.es.chef.io/configuration/changelog/ -->
-<!-- latest_release 16.2.25 -->
-## [v16.2.25](https://github.com/chef/chef/tree/v16.2.25) (2020-06-10)
+<!-- latest_release 16.2.26 -->
+## [v16.2.26](https://github.com/chef/chef/tree/v16.2.26) (2020-06-10)
#### Merged Pull Requests
-- Warn during bootstrapping when using validation keys [#9974](https://github.com/chef/chef/pull/9974) ([tas50](https://github.com/tas50))
+- Allow for the latest net-ssh and ffi 1.13.1 [#9978](https://github.com/chef/chef/pull/9978) ([tas50](https://github.com/tas50))
<!-- latest_release -->
<!-- release_rollup since=16.1.16 -->
### Changes not yet released to stable
#### Merged Pull Requests
+- Allow for the latest net-ssh and ffi 1.13.1 [#9978](https://github.com/chef/chef/pull/9978) ([tas50](https://github.com/tas50)) <!-- 16.2.26 -->
- Warn during bootstrapping when using validation keys [#9974](https://github.com/chef/chef/pull/9974) ([tas50](https://github.com/tas50)) <!-- 16.2.25 -->
- Let the user know what protocol we&#39;re using in knife bootstrap [#9973](https://github.com/chef/chef/pull/9973) ([tas50](https://github.com/tas50)) <!-- 16.2.24 -->
- Add Windows 8 Tester [#9971](https://github.com/chef/chef/pull/9971) ([christopher-snapp](https://github.com/christopher-snapp)) <!-- 16.2.23 -->