summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-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 77df6610b6..bae2b9d062 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,7 +1,9 @@
# Chef Client Changelog
-## Unreleased:
+## 11.18.0 RC0
+* 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
diff --git a/lib/chef/version.rb b/lib/chef/version.rb
index eb7157c038..0655365322 100644
--- a/lib/chef/version.rb
+++ b/lib/chef/version.rb
@@ -17,7 +17,7 @@
class Chef
CHEF_ROOT = File.dirname(File.expand_path(File.dirname(__FILE__)))
- VERSION = '11.16.4'
+ VERSION = '11.18.0.rc.0'
end
# NOTE: the Chef::Version class is defined in version_class.rb