summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChef Expeditor <eng-services-ops+chef-ci@chef.io>2017-10-16 17:37:50 +0000
committerChef Expeditor <eng-services-ops+chef-ci@chef.io>2017-10-16 17:37:50 +0000
commitf5e4bf7670c70bcd40a468790768fa1ba682c83a (patch)
treed8bddd743634b8c2e8a812a203772bc53377580c
parentc0c5c7caa487020169e0dbb80a75a9035f3a598f (diff)
downloadchef-f5e4bf7670c70bcd40a468790768fa1ba682c83a.tar.gz
Bump version to 13.5.20 by Chef Expeditorv13.5.20
-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 c288f13d20..5600f8cd0f 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.19 -->
-## [v13.5.19](https://github.com/chef/chef/tree/v13.5.19) (2017-10-13)
+<!-- latest_release 13.5.20 -->
+## [v13.5.20](https://github.com/chef/chef/tree/v13.5.20) (2017-10-16)
#### Merged Pull Requests
-- Windows: Added :none frequency to windows_task resource [#6394](https://github.com/chef/chef/pull/6394) ([NAshwini](https://github.com/NAshwini))
+- fix rebooter for solaris and background reboots [#6497](https://github.com/chef/chef/pull/6497) ([lamont-granquist](https://github.com/lamont-granquist))
<!-- latest_release -->
<!-- release_rollup since=13.5.3 -->
### Changes since 13.5.3 release
#### Merged Pull Requests
+- fix rebooter for solaris and background reboots [#6497](https://github.com/chef/chef/pull/6497) ([lamont-granquist](https://github.com/lamont-granquist)) <!-- 13.5.20 -->
- Windows: Added :none frequency to windows_task resource [#6394](https://github.com/chef/chef/pull/6394) ([NAshwini](https://github.com/NAshwini)) <!-- 13.5.19 -->
- only rhel &gt;= 8 and fedora &gt;= 22 get dnf [#6490](https://github.com/chef/chef/pull/6490) ([lamont-granquist](https://github.com/lamont-granquist)) <!-- 13.5.18 -->
- Support new CriticalOhaiPlugins [#6486](https://github.com/chef/chef/pull/6486) ([jaymzh](https://github.com/jaymzh)) <!-- 13.5.17 -->
diff --git a/Gemfile.lock b/Gemfile.lock
index 7ff76a6539..8f49ffb105 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -17,10 +17,10 @@ GIT
PATH
remote: .
specs:
- chef (13.5.19)
+ chef (13.5.20)
addressable
bundler (>= 1.10)
- chef-config (= 13.5.19)
+ chef-config (= 13.5.20)
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.19-universal-mingw32)
+ chef (13.5.20-universal-mingw32)
addressable
bundler (>= 1.10)
- chef-config (= 13.5.19)
+ chef-config (= 13.5.20)
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.19)
+ chef-config (13.5.20)
addressable
fuzzyurl
mixlib-config (~> 2.0)
diff --git a/VERSION b/VERSION
index 4b0e363282..f973016deb 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-13.5.19 \ No newline at end of file
+13.5.20 \ 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 e6da0bb426..f16979dd88 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.19"
+ VERSION = "13.5.20"
end
#
diff --git a/lib/chef/version.rb b/lib/chef/version.rb
index d04c99ccc9..c7ec4ab6e0 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.19")
+ VERSION = Chef::VersionString.new("13.5.20")
end
#