summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJay Mundrawala <jdmundrawala@gmail.com>2015-01-26 07:28:19 -0600
committerJay Mundrawala <jdmundrawala@gmail.com>2015-01-26 07:28:19 -0600
commit39c2c0a09af8c6911ec8e6bc945b54beae4b3869 (patch)
tree176571ae9554896d28ee8a5a767a624db3ea376c
parentfb7fe4b1240a1bedc82490768589e0206880d42c (diff)
downloadchef-39c2c0a09af8c6911ec8e6bc945b54beae4b3869.tar.gz
Prepare 11.18.611.18.6
-rw-r--r--CHANGELOG.md5
-rw-r--r--lib/chef/version.rb2
2 files changed, 5 insertions, 2 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8db41f8ade..578031f594 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,9 +1,12 @@
# Chef Client Changelog
-## 11.18.4
+## 11.18.6
* [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.4
+* Unreleased
+
## 11.18.2
* Unreleased
diff --git a/lib/chef/version.rb b/lib/chef/version.rb
index 57d4eb498f..b00378dd7f 100644
--- a/lib/chef/version.rb
+++ b/lib/chef/version.rb
@@ -16,7 +16,7 @@
class Chef
CHEF_ROOT = File.dirname(File.expand_path(File.dirname(__FILE__)))
- VERSION = '11.18.0'
+ VERSION = '11.18.6'
end
# NOTE: the Chef::Version class is defined in version_class.rb