summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--CHANGELOG.md12
-rw-r--r--Gemfile.lock10
-rw-r--r--VERSION2
-rw-r--r--chef-config/lib/chef-config/version.rb2
-rw-r--r--lib/chef/version.rb2
5 files changed, 18 insertions, 10 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 952c6ec8be..e9143b1713 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,8 +1,16 @@
<!-- usage documentation: http://expeditor-docs.es.chef.io/configuration/changelog/ -->
-<!-- latest_release -->
+<!-- latest_release 13.8.6 -->
+## [v13.8.6](https://github.com/chef/chef/tree/v13.8.6) (2018-03-09)
+
+#### Merged Pull Requests
+- Backport RFC-101/RFC-104 resource enhancements [#6964](https://github.com/chef/chef/pull/6964) ([thommay](https://github.com/thommay))
<!-- latest_release -->
-<!-- release_rollup -->
+<!-- release_rollup since=13.8.5 -->
+### Changes since 13.8.5 release
+
+#### Merged Pull Requests
+- Backport RFC-101/RFC-104 resource enhancements [#6964](https://github.com/chef/chef/pull/6964) ([thommay](https://github.com/thommay)) <!-- 13.8.6 -->
<!-- release_rollup -->
<!-- latest_stable_release -->
diff --git a/Gemfile.lock b/Gemfile.lock
index fe446b3e1b..6a6499c665 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -9,10 +9,10 @@ GIT
PATH
remote: .
specs:
- chef (13.8.5)
+ chef (13.8.6)
addressable
bundler (>= 1.10)
- chef-config (= 13.8.5)
+ chef-config (= 13.8.6)
chef-zero (>= 13.0)
diff-lcs (~> 1.2, >= 1.2.4)
erubis (~> 2.7)
@@ -39,10 +39,10 @@ PATH
specinfra (~> 2.10)
syslog-logger (~> 1.6)
uuidtools (~> 2.1.5)
- chef (13.8.5-universal-mingw32)
+ chef (13.8.6-universal-mingw32)
addressable
bundler (>= 1.10)
- chef-config (= 13.8.5)
+ chef-config (= 13.8.6)
chef-zero (>= 13.0)
diff-lcs (~> 1.2, >= 1.2.4)
erubis (~> 2.7)
@@ -84,7 +84,7 @@ PATH
PATH
remote: chef-config
specs:
- chef-config (13.8.5)
+ chef-config (13.8.6)
addressable
fuzzyurl
mixlib-config (~> 2.0)
diff --git a/VERSION b/VERSION
index 16b3c156a4..fb2ae58495 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-13.8.5 \ No newline at end of file
+13.8.6 \ No newline at end of file
diff --git a/chef-config/lib/chef-config/version.rb b/chef-config/lib/chef-config/version.rb
index 563dcca2ab..8d85c38c0c 100644
--- a/chef-config/lib/chef-config/version.rb
+++ b/chef-config/lib/chef-config/version.rb
@@ -21,7 +21,7 @@
module ChefConfig
CHEFCONFIG_ROOT = File.expand_path("../..", __FILE__)
- VERSION = "13.8.5"
+ VERSION = "13.8.6"
end
#
diff --git a/lib/chef/version.rb b/lib/chef/version.rb
index 306af48927..4be7bdbf2e 100644
--- a/lib/chef/version.rb
+++ b/lib/chef/version.rb
@@ -23,7 +23,7 @@ require "chef/version_string"
class Chef
CHEF_ROOT = File.expand_path("../..", __FILE__)
- VERSION = Chef::VersionString.new("13.8.5")
+ VERSION = Chef::VersionString.new("13.8.6")
end
#