summaryrefslogtreecommitdiff
path: root/CHANGELOG.md
diff options
context:
space:
mode:
authorChef Expeditor <expeditor@chef.io>2020-06-23 20:34:12 +0000
committerChef Expeditor <expeditor@chef.io>2020-06-23 20:34:12 +0000
commit434c86b30314fc4a348917f2804318d895c25bab (patch)
treec8197e9e50ed237ca0f511b15153dc503bb4dd71 /CHANGELOG.md
parent22e17ec16b2841451808739fa70fc3ffeb513b98 (diff)
downloadchef-434c86b30314fc4a348917f2804318d895c25bab.tar.gz
Bump version to 15.12.20 by Chef Expeditorv15.12.20
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 1c6f99641c..2f1c5114dc 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,15 +1,16 @@
<!-- usage documentation: http://expeditor-docs.es.chef.io/configuration/changelog/ -->
-<!-- latest_release 15.12.19 -->
-## [v15.12.19](https://github.com/chef/chef/tree/v15.12.19) (2020-06-23)
+<!-- latest_release 15.12.20 -->
+## [v15.12.20](https://github.com/chef/chef/tree/v15.12.20) (2020-06-23)
#### Merged Pull Requests
-- Pull in the latest net-ssh/net-sftp &amp; remove the http2 dep in chef-telemetry [#10053](https://github.com/chef/chef/pull/10053) ([tas50](https://github.com/tas50))
+- Pull in misc docs / comment updates from master [#10054](https://github.com/chef/chef/pull/10054) ([tas50](https://github.com/tas50))
<!-- latest_release -->
<!-- release_rollup since=15.11.8 -->
### Changes not yet released to stable
#### Merged Pull Requests
+- Pull in misc docs / comment updates from master [#10054](https://github.com/chef/chef/pull/10054) ([tas50](https://github.com/tas50)) <!-- 15.12.20 -->
- Pull in the latest net-ssh/net-sftp &amp; remove the http2 dep in chef-telemetry [#10053](https://github.com/chef/chef/pull/10053) ([tas50](https://github.com/tas50)) <!-- 15.12.19 -->
- Fix rspec warning about `not_to raise_error` with a specific exception. [#10037](https://github.com/chef/chef/pull/10037) ([tas50](https://github.com/tas50)) <!-- 15.12.18 -->
- Fix wrong unit test exposed by cleaning up rspec deprecations. [#10051](https://github.com/chef/chef/pull/10051) ([tas50](https://github.com/tas50)) <!-- 15.12.17 -->