summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChef Expeditor <eng-services-ops+chef-ci@chef.io>2017-12-13 12:06:42 +0000
committerChef Expeditor <eng-services-ops+chef-ci@chef.io>2017-12-13 12:06:42 +0000
commitadfaadb7e203e5b8f24b2d7db20c3deae7cfa9eb (patch)
tree1d536a6202389484ca7e09352dcdafb8a427e215
parent14cf20d2198eae4d3b0e83fce882bcf4ab61348e (diff)
downloadchef-adfaadb7e203e5b8f24b2d7db20c3deae7cfa9eb.tar.gz
Bump version to 13.6.35 by Expeditorv13.6.35
-rw-r--r--CHANGELOG.md7
-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, 12 insertions, 11 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index d18204d3c7..d5ca64f60a 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.34 -->
-## [v13.6.34](https://github.com/chef/chef/tree/v13.6.34) (2017-12-11)
+<!-- latest_release 13.6.35 -->
+## [v13.6.35](https://github.com/chef/chef/tree/v13.6.35) (2017-12-13)
#### Merged Pull Requests
-- 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))
+- Use comments in the github issue template [#6658](https://github.com/chef/chef/pull/6658) ([tas50](https://github.com/tas50))
<!-- latest_release -->
<!-- release_rollup since=13.6.4 -->
### Changes since 13.6.4 release
#### Merged Pull Requests
+- 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 -->
- Fix sneaky chefstyle violations [#6655](https://github.com/chef/chef/pull/6655) ([thommay](https://github.com/thommay)) <!-- 13.6.32 -->
diff --git a/Gemfile.lock b/Gemfile.lock
index 5e492ec332..8cc693a66c 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -17,10 +17,10 @@ GIT
PATH
remote: .
specs:
- chef (13.6.34)
+ chef (13.6.35)
addressable
bundler (>= 1.10)
- chef-config (= 13.6.34)
+ chef-config (= 13.6.35)
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.34-universal-mingw32)
+ chef (13.6.35-universal-mingw32)
addressable
bundler (>= 1.10)
- chef-config (= 13.6.34)
+ chef-config (= 13.6.35)
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.34)
+ chef-config (13.6.35)
addressable
fuzzyurl
mixlib-config (~> 2.0)
diff --git a/VERSION b/VERSION
index 1f374e29e3..24f95cfd28 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-13.6.34 \ No newline at end of file
+13.6.35 \ 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 c143f91247..0b63871e2b 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.34"
+ VERSION = "13.6.35"
end
#
diff --git a/lib/chef/version.rb b/lib/chef/version.rb
index 6436f0b99f..825b87167e 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.34")
+ VERSION = Chef::VersionString.new("13.6.35")
end
#