Bump version to 13.6.36 by Expeditorv13.6.36

5 files changed, 12 insertions, 11 deletions

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d5ca64f60a..0212e0a406 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,15 +1,16 @@
 <!-- usage documentation: http://expeditor-docs.es.chef.io/configuration/changelog/ -->
-<!-- latest_release 13.6.35 -->
-## [v13.6.35](https://github.com/chef/chef/tree/v13.6.35) (2017-12-13)
+<!-- latest_release 13.6.36 -->
+## [v13.6.36](https://github.com/chef/chef/tree/v13.6.36) (2017-12-15)
 
 #### Merged Pull Requests
-- Use comments in the github issue template [#6658](https://github.com/chef/chef/pull/6658) ([tas50](https://github.com/tas50))
+- Don&#39;t use .match? which is Ruby 2.4+ only in windows_task [#6675](https://github.com/chef/chef/pull/6675) ([tas50](https://github.com/tas50))
 <!-- latest_release -->
 
 <!-- release_rollup since=13.6.4 -->
 ### Changes since 13.6.4 release
 
 #### Merged Pull Requests
+- Don&#39;t use .match? which is Ruby 2.4+ only in windows_task [#6675](https://github.com/chef/chef/pull/6675) ([tas50](https://github.com/tas50)) <!-- 13.6.36 -->
 - Use comments in the github issue template [#6658](https://github.com/chef/chef/pull/6658) ([tas50](https://github.com/tas50)) <!-- 13.6.35 -->
 - windows_task: Fix resource isn&#39;t fully idempotent due to command property [#6654](https://github.com/chef/chef/pull/6654) ([Vasu1105](https://github.com/Vasu1105)) <!-- 13.6.34 -->
 - Invalid date error on windows_task with frequency :on_logon [#6618](https://github.com/chef/chef/pull/6618) ([NimishaS](https://github.com/NimishaS)) <!-- 13.6.33 -->
diff --git a/Gemfile.lock b/Gemfile.lock
index 8cc693a66c..6bc92a42de 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -17,10 +17,10 @@ GIT
 PATH
   remote: .
   specs:
-    chef (13.6.35)
+    chef (13.6.36)
       addressable
       bundler (>= 1.10)
-      chef-config (= 13.6.35)
+      chef-config (= 13.6.36)
       chef-zero (>= 13.0)
       diff-lcs (~> 1.2, >= 1.2.4)
       erubis (~> 2.7)
@@ -47,10 +47,10 @@ PATH
       specinfra (~> 2.10)
       syslog-logger (~> 1.6)
       uuidtools (~> 2.1.5)
-    chef (13.6.35-universal-mingw32)
+    chef (13.6.36-universal-mingw32)
       addressable
       bundler (>= 1.10)
-      chef-config (= 13.6.35)
+      chef-config (= 13.6.36)
       chef-zero (>= 13.0)
       diff-lcs (~> 1.2, >= 1.2.4)
       erubis (~> 2.7)
@@ -92,7 +92,7 @@ PATH
 PATH
   remote: chef-config
   specs:
-    chef-config (13.6.35)
+    chef-config (13.6.36)
       addressable
       fuzzyurl
       mixlib-config (~> 2.0)
diff --git a/VERSION b/VERSION
index 24f95cfd28..eb7e2224a2 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-13.6.35
\ No newline at end of file
+13.6.36
\ 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 0b63871e2b..026bfa840b 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.6.35"
+  VERSION = "13.6.36"
 end
 
 #
diff --git a/lib/chef/version.rb b/lib/chef/version.rb
index 825b87167e..0f2ae86064 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.6.35")
+  VERSION = Chef::VersionString.new("13.6.36")
 end
 
 #