summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJay Mundrawala <jdmundrawala@gmail.com>2015-01-23 10:23:06 -0800
committerJay Mundrawala <jdmundrawala@gmail.com>2015-01-23 10:23:06 -0800
commitfb7fe4b1240a1bedc82490768589e0206880d42c (patch)
treebd6ced396737143126c4c744d998f3de6a37f2d9
parent6d9109a6bdb083aaf59bc28cfe0d06362d7d21c8 (diff)
parentc54a9adb38669424e6a7e697be7eb3b50a478050 (diff)
downloadchef-fb7fe4b1240a1bedc82490768589e0206880d42c.tar.gz
Merge pull request #2792 from chef/jdm/11.18.411.18.4
Prepare 11.18.4
-rw-r--r--CHANGELOG.md7
1 files changed, 5 insertions, 2 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1095558e86..8db41f8ade 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,9 +1,12 @@
# Chef Client Changelog
-## 11.18.2
-* [Issue 2786](https://github.com/chef/chef/issues/2768) Bundle working version of cacerts because the
+## 11.18.4
+* [Issue 2786](https://github.com/chef/chef/issues/2786) Bundle working version of cacerts because the
newest version does not work with AWS.
+## 11.18.2
+* Unreleased
+
## 11.18.0
* Fix an issue where knife could load commands from a different