summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJay Mundrawala <jdmundrawala@gmail.com>2015-01-13 16:06:23 -0800
committerJay Mundrawala <jdmundrawala@gmail.com>2015-01-13 16:06:23 -0800
commit18e85d943e683d1e793c389dda1bb833d5f73666 (patch)
tree6c958943b344c2fcf385593a6f4bb708684accfe
parent7a6f7d5fa16a906ef2b0e6582c9458b3369573fb (diff)
parent745325e7baf40c6599706dbfa7fd10d3ea2ffd68 (diff)
downloadchef-18e85d943e683d1e793c389dda1bb833d5f73666.tar.gz
Merge pull request #2750 from opscode/jdm/prepare-11.18.011.18.0
Prepare Chef 11.18.0 release
-rw-r--r--CHANGELOG.md4
-rw-r--r--lib/chef/version.rb2
2 files changed, 4 insertions, 2 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index bae2b9d062..85bea77728 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,12 +1,14 @@
# Chef Client Changelog
-## 11.18.0 RC0
+## 11.18.0
* Fix an issue where knife could load commands from a different
version of chef in ChefDK. [ChefDK #227](https://github.com/opscode/chef-dk/issues/227)
* Removed dependencies on the 'json' gem, replaced with ffi-yajl. Use Chef::JSONCompat library for parsing and printing.
* [Issue 2027](https://github.com/opscode/chef/issues/2027) Allow recipe using `dsc_script` opportunity to install Powershell 4 or higher
* [Issue 2169](https://github.com/opscode/chef/issues/2169) Attempt to converge DSC configurations with resources that do not correctly support what-if
+* [**Seth Vargo**](https://github.com/sethvargo)
+ [Issue 2345](https://github.com/opscode/chef/issues/2345) Allow knife to install cookbooks with metadata.json
## Last Release: 11.16.4
diff --git a/lib/chef/version.rb b/lib/chef/version.rb
index 4b4f5a6d93..57d4eb498f 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.rc.1'
+ VERSION = '11.18.0'
end
# NOTE: the Chef::Version class is defined in version_class.rb