summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChef Expeditor <chef-ci@chef.io>2020-12-29 00:37:33 +0000
committerChef Expeditor <chef-ci@chef.io>2020-12-29 00:37:33 +0000
commita45ee0adc7ea5e498fd411f8ba3a279111bc87f5 (patch)
tree1f4f3e95be1c285f9ed16aab894ed2cfdafc89a7
parentdbe75006394f24a1234c2f5f18157358a63d6b3f (diff)
downloadchef-a45ee0adc7ea5e498fd411f8ba3a279111bc87f5.tar.gz
Update CHANGELOG.md with details from pull request #10761
Obvious fix; these changes are the result of automation not creative thinking.
-rw-r--r--CHANGELOG.md7
1 files changed, 4 insertions, 3 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index f0475c1956..5d42993c74 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,15 +1,16 @@
<!-- usage documentation: http://expeditor-docs.es.chef.io/configuration/changelog/ -->
-<!-- latest_release 17.0.11 -->
-## [v17.0.11](https://github.com/chef/chef/tree/v17.0.11) (2020-12-29)
+<!-- latest_release unreleased -->
+## Unreleased
#### Merged Pull Requests
-- Cleanup knife status [#10782](https://github.com/chef/chef/pull/10782) ([phiggins](https://github.com/phiggins))
+- Stub http requests in rubygems tests. [#10761](https://github.com/chef/chef/pull/10761) ([phiggins](https://github.com/phiggins))
<!-- latest_release -->
<!-- release_rollup since=16.8.14 -->
### Changes not yet released to stable
#### Merged Pull Requests
+- Stub http requests in rubygems tests. [#10761](https://github.com/chef/chef/pull/10761) ([phiggins](https://github.com/phiggins)) <!-- 17.0.11 -->
- Cleanup knife status [#10782](https://github.com/chef/chef/pull/10782) ([phiggins](https://github.com/phiggins)) <!-- 17.0.11 -->
- Fix knife status json output for EC2 instance with no public IP. [#10781](https://github.com/chef/chef/pull/10781) ([phiggins](https://github.com/phiggins)) <!-- 17.0.10 -->
- Refactor the code for windows_security_policy resource [#10699](https://github.com/chef/chef/pull/10699) ([chef-davin](https://github.com/chef-davin)) <!-- 17.0.9 -->