summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChef Expeditor <eng-services-ops+chef-ci@chef.io>2018-09-06 23:01:15 +0000
committerChef Expeditor <eng-services-ops+chef-ci@chef.io>2018-09-06 23:01:15 +0000
commitd3d5321365cdca896759981536e97bdab1a5e200 (patch)
treec21aa201015c82148d609afe9de0498f9a26468d
parentd956159f9d9a1df33349e6f3e94df35c1b39d31f (diff)
downloadchef-d3d5321365cdca896759981536e97bdab1a5e200.tar.gz
Bump version to 14.5.4 by Chef Expeditorv14.5.4
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 b82fc780ac..7a36dd7e44 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.3 -->
-## [v14.5.3](https://github.com/chef/chef/tree/v14.5.3) (2018-09-06)
+<!-- latest_release 14.5.4 -->
+## [v14.5.4](https://github.com/chef/chef/tree/v14.5.4) (2018-09-06)
#### Merged Pull Requests
-- Remove the CBGB [#7619](https://github.com/chef/chef/pull/7619) ([nathenharvey](https://github.com/nathenharvey))
+- Add additional resource descriptions [#7623](https://github.com/chef/chef/pull/7623) ([tas50](https://github.com/tas50))
<!-- latest_release -->
<!-- release_rollup since=14.4.56 -->
### Changes since 14.4.56 release
#### Merged Pull Requests
+- Add additional resource descriptions [#7623](https://github.com/chef/chef/pull/7623) ([tas50](https://github.com/tas50)) <!-- 14.5.4 -->
- Remove the CBGB [#7619](https://github.com/chef/chef/pull/7619) ([nathenharvey](https://github.com/nathenharvey)) <!-- 14.5.3 -->
- Update rubyzip to 1.2.2 [#7618](https://github.com/chef/chef/pull/7618) ([tas50](https://github.com/tas50)) <!-- 14.5.2 -->
- Shorten the resource collision deprecation message [#7601](https://github.com/chef/chef/pull/7601) ([lamont-granquist](https://github.com/lamont-granquist)) <!-- 14.5.1 -->
diff --git a/Gemfile.lock b/Gemfile.lock
index c3b9f73f5f..731544ee53 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -9,10 +9,10 @@ GIT
PATH
remote: .
specs:
- chef (14.5.3)
+ chef (14.5.4)
addressable
bundler (>= 1.10)
- chef-config (= 14.5.3)
+ chef-config (= 14.5.4)
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.3-universal-mingw32)
+ chef (14.5.4-universal-mingw32)
addressable
bundler (>= 1.10)
- chef-config (= 14.5.3)
+ chef-config (= 14.5.4)
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.3)
+ chef-config (14.5.4)
addressable
fuzzyurl
mixlib-config (>= 2.2.12, < 3.0)
diff --git a/VERSION b/VERSION
index 7f0423b3c4..b51f608d94 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-14.5.3 \ No newline at end of file
+14.5.4 \ 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 6e6879fe2f..c06069d22f 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.3".freeze
+ VERSION = "14.5.4".freeze
end
#
diff --git a/lib/chef/version.rb b/lib/chef/version.rb
index 526817212d..75f22fe9e4 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.3")
+ VERSION = Chef::VersionString.new("14.5.4")
end
#