summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThom May <thom@may.lt>2015-07-09 14:09:05 +0100
committerThom May <thom@may.lt>2015-07-09 14:09:05 +0100
commitecebd7ce87061d75c66a980f4cfd62b43cc608a5 (patch)
tree1c3f793f8803555efc9b9efafefca26908749158
parentd18c6537cb8b7836e3ce9c9591aed906790a8fd1 (diff)
parent96fa477f9cf508cb92b5e0a2adc96c18c89d5a16 (diff)
downloadchef-11-stable.tar.gz
Merge pull request #3654 from chef/tm/11.18.1411.18.1411-stable
Release 11.18.14
-rw-r--r--CHANGELOG.md3
-rw-r--r--lib/chef/version.rb2
2 files changed, 4 insertions, 1 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9cb12c4ff8..a1a6517aa8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,8 @@
# Chef Client Changelog
+## 11.18.14
+* Omnibus security updates for OpenSSL vulnerability CVE-2015-1793
+
## 11.18.12
* Omnibus security updates for OpenSSL vulnerabilities CVE-2015-0286,
CVE-2015-0287, CVE-2015-0289, CVE-2015-0292, CVE-2015-0293,
diff --git a/lib/chef/version.rb b/lib/chef/version.rb
index f7607a6c00..37d53cad78 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.12'
+ VERSION = '11.18.14'
end
# NOTE: the Chef::Version class is defined in version_class.rb