summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Smith <tsmith@chef.io>2019-09-10 16:49:51 -0700
committerGitHub <noreply@github.com>2019-09-10 16:49:51 -0700
commit292bf24a26da9d0b7b99d2dce3d2b9b37cf94f28 (patch)
tree864b932fdf0be1a7c9c80b5e28a0ebfd31776a1c
parentb54d4150a3b4f6716ecbca53279b3e5611196104 (diff)
parent241324a1728dea9d71da3cf09288368b85675c08 (diff)
downloadchef-292bf24a26da9d0b7b99d2dce3d2b9b37cf94f28.tar.gz
Merge pull request #8873 from timgates42/feature/simple_typo
Fix simple typo: acceptannce -> acceptance
-rw-r--r--CHANGELOG.md4
1 files changed, 2 insertions, 2 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index a98f900d13..c6fbe331d6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -425,7 +425,7 @@
- Restore bootstrap pre-release support [#8442](https://github.com/chef/chef/pull/8442) ([marcparadise](https://github.com/marcparadise))
- Move more DSL helpers into universal so they&#39;re available everywhere [#8457](https://github.com/chef/chef/pull/8457) ([lamont-granquist](https://github.com/lamont-granquist))
- [CHEF-8423] Upgrade train-core to 2.1.0 for windows detection over ssh [#8465](https://github.com/chef/chef/pull/8465) ([marcparadise](https://github.com/marcparadise))
-- Add logic to require acceptannce of the Chef license to run the client [#8354](https://github.com/chef/chef/pull/8354) ([tyler-ball](https://github.com/tyler-ball))
+- Add logic to require acceptance of the Chef license to run the client [#8354](https://github.com/chef/chef/pull/8354) ([tyler-ball](https://github.com/tyler-ball))
- Initial target_mode implementation [#7758](https://github.com/chef/chef/pull/7758) ([btm](https://github.com/btm))
- Chef 15: Unable to create temp dir on windows system [#8476](https://github.com/chef/chef/pull/8476) ([vsingh-msys](https://github.com/vsingh-msys))
- Remove the Chef 11 admin flag from knife client create [#8473](https://github.com/chef/chef/pull/8473) ([tas50](https://github.com/tas50))
@@ -2893,4 +2893,4 @@ of partial templates.
* Fixed a bug where nested resources that inherited from Resource::LWRPBase
would not share the same actions/default_action as their parent
* Raise error if a guard_interpreter is specified and a block is passed to a guard (conditional)
-* Allow specifying a guard_interpreter after a conditional on a resource (Fixes #1943) \ No newline at end of file
+* Allow specifying a guard_interpreter after a conditional on a resource (Fixes #1943)