summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChef Expeditor <expeditor@chef.io>2020-07-14 17:24:57 +0000
committerChef Expeditor <expeditor@chef.io>2020-07-14 17:24:57 +0000
commit421013ce1b3ef89fc3d5fbb631b4816cb59f71eb (patch)
tree3161b5b9f45802dbab54fa6e0ba90d5429358ecc
parent36a92ce258247b44fea1150e2f05f6452a3c0577 (diff)
downloadchef-421013ce1b3ef89fc3d5fbb631b4816cb59f71eb.tar.gz
Update CHANGELOG.md with details from pull request #10154
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 880f4812e7..2cfe9f784f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,7 @@
## Unreleased
#### Merged Pull Requests
+- Don&#39;t allow setting expectations on nil. [#10154](https://github.com/chef/chef/pull/10154) ([phiggins](https://github.com/phiggins))
- Use rspec constant stubbing. [#10155](https://github.com/chef/chef/pull/10155) ([phiggins](https://github.com/phiggins))
<!-- latest_release -->
@@ -10,6 +11,7 @@
### Changes not yet released to stable
#### Merged Pull Requests
+- Don&#39;t allow setting expectations on nil. [#10154](https://github.com/chef/chef/pull/10154) ([phiggins](https://github.com/phiggins)) <!-- 16.3.7 -->
- Use rspec constant stubbing. [#10155](https://github.com/chef/chef/pull/10155) ([phiggins](https://github.com/phiggins)) <!-- 16.3.7 -->
- Bump the server api version to 2 [#10140](https://github.com/chef/chef/pull/10140) ([lamont-granquist](https://github.com/lamont-granquist)) <!-- 16.3.7 -->
- Fixed `knife cookbook upload -o` windows path issue [#10146](https://github.com/chef/chef/pull/10146) ([antima-gupta](https://github.com/antima-gupta)) <!-- 16.3.6 -->