From fb600d596d998c91188f9b6ac412aaebd34465cc Mon Sep 17 00:00:00 2001
From: Chef Expeditor <eng-services-ops+chef-ci@chef.io>
Date: Mon, 29 Jan 2018 18:20:11 +0000
Subject: Bump version to 14.0.36 by Expeditor

---
 CHANGELOG.md                           |  7 ++++---
 Gemfile.lock                           | 10 +++++-----
 VERSION                                |  2 +-
 chef-config/lib/chef-config/version.rb |  2 +-
 lib/chef/version.rb                    |  2 +-
 5 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a5808bb38d..e7e2104a3f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,15 +1,16 @@
 <!-- usage documentation: http://expeditor-docs.es.chef.io/configuration/changelog/ -->
-<!-- latest_release 14.0.35 -->
-## [v14.0.35](https://github.com/chef/chef/tree/v14.0.35) (2018-01-29)
+<!-- latest_release 14.0.36 -->
+## [v14.0.36](https://github.com/chef/chef/tree/v14.0.36) (2018-01-29)
 
 #### Merged Pull Requests
-- Add MSIFASTINSTALL property, supported by Windows Installer 5.0 [#6806](https://github.com/chef/chef/pull/6806) ([stuartpreston](https://github.com/stuartpreston))
+- Add create, delete and configure actions to windows_service [#6804](https://github.com/chef/chef/pull/6804) ([jasonwbarnett](https://github.com/jasonwbarnett))
 <!-- latest_release -->
 
 <!-- release_rollup since=13.7.16 -->
 ### Changes since 13.7.16 release
 
 #### Merged Pull Requests
+- Add create, delete and configure actions to windows_service [#6804](https://github.com/chef/chef/pull/6804) ([jasonwbarnett](https://github.com/jasonwbarnett)) <!-- 14.0.36 -->
 - Add MSIFASTINSTALL property, supported by Windows Installer 5.0 [#6806](https://github.com/chef/chef/pull/6806) ([stuartpreston](https://github.com/stuartpreston)) <!-- 14.0.35 -->
 - Use attempt or attempts in the retries logging [#6802](https://github.com/chef/chef/pull/6802) ([tas50](https://github.com/tas50)) <!-- 14.0.34 -->
 - Remove epic_fail alias to ignore_failure [#6801](https://github.com/chef/chef/pull/6801) ([tas50](https://github.com/tas50)) <!-- 14.0.33 -->
diff --git a/Gemfile.lock b/Gemfile.lock
index aed8f80459..b8b7d9f971 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -35,10 +35,10 @@ GIT
 PATH
   remote: .
   specs:
-    chef (14.0.35)
+    chef (14.0.36)
       addressable
       bundler (>= 1.10)
-      chef-config (= 14.0.35)
+      chef-config (= 14.0.36)
       chef-zero (>= 13.0)
       diff-lcs (~> 1.2, >= 1.2.4)
       erubis (~> 2.7)
@@ -65,10 +65,10 @@ PATH
       specinfra (~> 2.10)
       syslog-logger (~> 1.6)
       uuidtools (~> 2.1.5)
-    chef (14.0.35-universal-mingw32)
+    chef (14.0.36-universal-mingw32)
       addressable
       bundler (>= 1.10)
-      chef-config (= 14.0.35)
+      chef-config (= 14.0.36)
       chef-zero (>= 13.0)
       diff-lcs (~> 1.2, >= 1.2.4)
       erubis (~> 2.7)
@@ -110,7 +110,7 @@ PATH
 PATH
   remote: chef-config
   specs:
-    chef-config (14.0.35)
+    chef-config (14.0.36)
       addressable
       fuzzyurl
       mixlib-config (~> 2.0)
diff --git a/VERSION b/VERSION
index c731bc1de9..31479f4b8a 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-14.0.35
\ No newline at end of file
+14.0.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 0860eccc2c..6290e485e2 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 = "14.0.35"
+  VERSION = "14.0.36"
 end
 
 #
diff --git a/lib/chef/version.rb b/lib/chef/version.rb
index d2f797c018..127345609b 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("14.0.35")
+  VERSION = Chef::VersionString.new("14.0.36")
 end
 
 #
-- 
cgit v1.2.1