summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChef Expeditor <eng-services-ops+chef-ci@chef.io>2017-10-10 03:07:21 +0000
committerChef Expeditor <eng-services-ops+chef-ci@chef.io>2017-10-10 03:07:21 +0000
commit59e254411f78a14528cc6a3c9fa37e560fc03d1c (patch)
tree394266246d0140a00258270d5b590ce738d946c2
parent537d4e33052466680113a07fb1d4efa96d8e06d4 (diff)
downloadchef-59e254411f78a14528cc6a3c9fa37e560fc03d1c.tar.gz
Bump version to 13.5.17 by Chef Expeditorv13.5.17
-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 7f37309733..637ed19806 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,15 +1,16 @@
<!-- usage documentation: http://expeditor-docs.es.chef.io/configuration/changelog/ -->
-<!-- latest_release 13.5.16 -->
-## [v13.5.16](https://github.com/chef/chef/tree/v13.5.16) (2017-10-09)
+<!-- latest_release 13.5.17 -->
+## [v13.5.17](https://github.com/chef/chef/tree/v13.5.17) (2017-10-10)
#### Merged Pull Requests
-- Sleep for another interval after handling SIGHUP [#6461](https://github.com/chef/chef/pull/6461) ([grekasius](https://github.com/grekasius))
+- Support new CriticalOhaiPlugins [#6486](https://github.com/chef/chef/pull/6486) ([jaymzh](https://github.com/jaymzh))
<!-- latest_release -->
<!-- release_rollup since=13.5.3 -->
### Changes since 13.5.3 release
#### Merged Pull Requests
+- Support new CriticalOhaiPlugins [#6486](https://github.com/chef/chef/pull/6486) ([jaymzh](https://github.com/jaymzh)) <!-- 13.5.17 -->
- Sleep for another interval after handling SIGHUP [#6461](https://github.com/chef/chef/pull/6461) ([grekasius](https://github.com/grekasius)) <!-- 13.5.16 -->
- [SUSTAIN-731] Don&#39;t spin in powershell module that launches chef processes [#6481](https://github.com/chef/chef/pull/6481) ([ksubrama](https://github.com/ksubrama)) <!-- 13.5.15 -->
- Add allow_downgrade to zypper_package resource [#6476](https://github.com/chef/chef/pull/6476) ([yeoldegrove](https://github.com/yeoldegrove)) <!-- 13.5.14 -->
diff --git a/Gemfile.lock b/Gemfile.lock
index cf066e0dc9..0232783879 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -17,10 +17,10 @@ GIT
PATH
remote: .
specs:
- chef (13.5.16)
+ chef (13.5.17)
addressable
bundler (>= 1.10)
- chef-config (= 13.5.16)
+ chef-config (= 13.5.17)
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.5.16-universal-mingw32)
+ chef (13.5.17-universal-mingw32)
addressable
bundler (>= 1.10)
- chef-config (= 13.5.16)
+ chef-config (= 13.5.17)
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.5.16)
+ chef-config (13.5.17)
addressable
fuzzyurl
mixlib-config (~> 2.0)
diff --git a/VERSION b/VERSION
index de588732a5..ce870b93c8 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-13.5.16 \ No newline at end of file
+13.5.17 \ 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 3aa86207c7..0487272917 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.5.16"
+ VERSION = "13.5.17"
end
#
diff --git a/lib/chef/version.rb b/lib/chef/version.rb
index 4013fb2f18..16454557c5 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.5.16")
+ VERSION = Chef::VersionString.new("13.5.17")
end
#