summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChef Expeditor <chef-ci@chef.io>2020-08-08 02:24:34 +0000
committerChef Expeditor <chef-ci@chef.io>2020-08-08 02:24:34 +0000
commit5c8383fedd13b07f13d64a58f7cc78664a235ced (patch)
treef0d032f31c490e0f1018e00787bc806381a82da4
parent6c391fac27df828c2d391e560fdc6317b57ff1df (diff)
downloadchef-5c8383fedd13b07f13d64a58f7cc78664a235ced.tar.gz
Update CHANGELOG.md with details from pull request #10280
Obvious fix; these changes are the result of automation not creative thinking.
-rw-r--r--CHANGELOG.md2
1 files changed, 2 insertions, 0 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 26adf59bb1..16f301d71c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,7 @@
## Unreleased
#### Merged Pull Requests
+- Fix broken powershell_script test. [#10280](https://github.com/chef/chef/pull/10280) ([phiggins](https://github.com/phiggins))
- Clean up some interdependencies in script resource tests. [#10279](https://github.com/chef/chef/pull/10279) ([phiggins](https://github.com/phiggins))
- Remove an unnecessary shared_context from execute resource tests [#10278](https://github.com/chef/chef/pull/10278) ([phiggins](https://github.com/phiggins))
<!-- latest_release -->
@@ -11,6 +12,7 @@
### Changes not yet released to stable
#### Merged Pull Requests
+- Fix broken powershell_script test. [#10280](https://github.com/chef/chef/pull/10280) ([phiggins](https://github.com/phiggins)) <!-- 16.4.16 -->
- Clean up some interdependencies in script resource tests. [#10279](https://github.com/chef/chef/pull/10279) ([phiggins](https://github.com/phiggins)) <!-- 16.4.16 -->
- Remove an unnecessary shared_context from execute resource tests [#10278](https://github.com/chef/chef/pull/10278) ([phiggins](https://github.com/phiggins)) <!-- 16.4.16 -->
- Mark deep_merge as private [#10277](https://github.com/chef/chef/pull/10277) ([lamont-granquist](https://github.com/lamont-granquist)) <!-- 16.4.16 -->