summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBryan McLellan <btm@loftninjas.org>2014-10-01 15:01:02 -0400
committerBryan McLellan <btm@loftninjas.org>2014-10-01 15:01:02 -0400
commit00ecc94e206da3c09cf5dac8d698deaba970d8b2 (patch)
treed16f5a344005d5bd7f4a1e10fefcaa15c64962e0
parent8e7c8b9f3d4a86ae741fec43d8edefcd14ebb5b5 (diff)
downloadchef-00ecc94e206da3c09cf5dac8d698deaba970d8b2.tar.gz
Update CHANGELOG for guard updates
-rw-r--r--CHANGELOG.md2
1 files changed, 2 insertions, 0 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 197d537d74..06c4b606aa 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -271,3 +271,5 @@
* Added DelayedEvaluator support in LWRP using the `lazy {}` key
* 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)