summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChef Expeditor <eng-services-ops+chef-ci@chef.io>2018-09-15 15:07:41 +0000
committerChef Expeditor <eng-services-ops+chef-ci@chef.io>2018-09-15 15:07:41 +0000
commit0351bc887a7fd158eef2ed633ad0ff8ca647e8c5 (patch)
tree0d981a002236ad9f5f2949679123832978764899
parent67c7a8cf81a248ea4012e6e536fc4059f679be13 (diff)
downloadchef-0351bc887a7fd158eef2ed633ad0ff8ca647e8c5.tar.gz
Bump version to 14.5.20 by Chef Expeditorv14.5.20
Obvious fix; these changes are the result of automation not creative thinking.
-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 066d642386..fbeb10ba46 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,15 +1,16 @@
<!-- usage documentation: http://expeditor-docs.es.chef.io/configuration/changelog/ -->
-<!-- latest_release 14.5.19 -->
-## [v14.5.19](https://github.com/chef/chef/tree/v14.5.19) (2018-09-15)
+<!-- latest_release 14.5.20 -->
+## [v14.5.20](https://github.com/chef/chef/tree/v14.5.20) (2018-09-15)
#### Merged Pull Requests
-- Fix resource descriptions for ohai_hint and rhsm_errata_level [#7645](https://github.com/chef/chef/pull/7645) ([tas50](https://github.com/tas50))
+- More Resource doc fixes [#7646](https://github.com/chef/chef/pull/7646) ([tas50](https://github.com/tas50))
<!-- latest_release -->
<!-- release_rollup since=14.4.56 -->
### Changes since 14.4.56 release
#### Merged Pull Requests
+- More Resource doc fixes [#7646](https://github.com/chef/chef/pull/7646) ([tas50](https://github.com/tas50)) <!-- 14.5.20 -->
- Fix resource descriptions for ohai_hint and rhsm_errata_level [#7645](https://github.com/chef/chef/pull/7645) ([tas50](https://github.com/tas50)) <!-- 14.5.19 -->
- Bump ohai to 14.5.0 [#7644](https://github.com/chef/chef/pull/7644) ([chef-ci](https://github.com/chef-ci)) <!-- 14.5.18 -->
- Rename windows_ad_join&#39;s newname to be new_hostname [#7643](https://github.com/chef/chef/pull/7643) ([tas50](https://github.com/tas50)) <!-- 14.5.17 -->
diff --git a/Gemfile.lock b/Gemfile.lock
index 5b51944456..8ff8449a1b 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -9,10 +9,10 @@ GIT
PATH
remote: .
specs:
- chef (14.5.19)
+ chef (14.5.20)
addressable
bundler (>= 1.10)
- chef-config (= 14.5.19)
+ chef-config (= 14.5.20)
chef-zero (>= 13.0)
diff-lcs (~> 1.2, >= 1.2.4)
erubis (~> 2.7)
@@ -40,10 +40,10 @@ PATH
specinfra (~> 2.10)
syslog-logger (~> 1.6)
uuidtools (~> 2.1.5)
- chef (14.5.19-universal-mingw32)
+ chef (14.5.20-universal-mingw32)
addressable
bundler (>= 1.10)
- chef-config (= 14.5.19)
+ chef-config (= 14.5.20)
chef-zero (>= 13.0)
diff-lcs (~> 1.2, >= 1.2.4)
erubis (~> 2.7)
@@ -86,7 +86,7 @@ PATH
PATH
remote: chef-config
specs:
- chef-config (14.5.19)
+ chef-config (14.5.20)
addressable
fuzzyurl
mixlib-config (>= 2.2.12, < 3.0)
diff --git a/VERSION b/VERSION
index f5915259d9..7a3f6dba47 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-14.5.19 \ No newline at end of file
+14.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 387d515c8e..c57a4f2c43 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.5.19".freeze
+ VERSION = "14.5.20".freeze
end
#
diff --git a/lib/chef/version.rb b/lib/chef/version.rb
index ae514aecdd..d297727c52 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.5.19")
+ VERSION = Chef::VersionString.new("14.5.20")
end
#