summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChef Expeditor <eng-services-ops+chef-ci@chef.io>2018-09-06 05:05:00 +0000
committerChef Expeditor <eng-services-ops+chef-ci@chef.io>2018-09-06 05:05:00 +0000
commit1f2bd56d781868cd259b71ce56e6b9bc992f0bea (patch)
tree96f68f166766e5e552a6f417f8de3d5e53455756
parent1c60cb074f7cfa5f61dba753aa5bb3e97984bdac (diff)
downloadchef-1f2bd56d781868cd259b71ce56e6b9bc992f0bea.tar.gz
Bump version to 14.5.2 by Chef Expeditorv14.5.2
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 53b00dcc9a..8f3d7863d7 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.1 -->
-## [v14.5.1](https://github.com/chef/chef/tree/v14.5.1) (2018-09-05)
+<!-- latest_release 14.5.2 -->
+## [v14.5.2](https://github.com/chef/chef/tree/v14.5.2) (2018-09-06)
#### Merged Pull Requests
-- Shorten the resource collision deprecation message [#7601](https://github.com/chef/chef/pull/7601) ([lamont-granquist](https://github.com/lamont-granquist))
+- Update rubyzip to 1.2.2 [#7618](https://github.com/chef/chef/pull/7618) ([tas50](https://github.com/tas50))
<!-- latest_release -->
<!-- release_rollup since=14.4.56 -->
### Changes since 14.4.56 release
#### Merged Pull Requests
+- 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 -->
- Update inspec-core to 2.2.78 [#7606](https://github.com/chef/chef/pull/7606) ([tas50](https://github.com/tas50)) <!-- 14.5.0 -->
- Update property descriptions and remove extra nil types [#7604](https://github.com/chef/chef/pull/7604) ([tas50](https://github.com/tas50)) <!-- 14.4.63 -->
diff --git a/Gemfile.lock b/Gemfile.lock
index 1a13c3dffe..8b2f9868c6 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -9,10 +9,10 @@ GIT
PATH
remote: .
specs:
- chef (14.5.1)
+ chef (14.5.2)
addressable
bundler (>= 1.10)
- chef-config (= 14.5.1)
+ chef-config (= 14.5.2)
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.1-universal-mingw32)
+ chef (14.5.2-universal-mingw32)
addressable
bundler (>= 1.10)
- chef-config (= 14.5.1)
+ chef-config (= 14.5.2)
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.1)
+ chef-config (14.5.2)
addressable
fuzzyurl
mixlib-config (>= 2.2.12, < 3.0)
diff --git a/VERSION b/VERSION
index afd36b7696..e9d8f88edb 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-14.5.1 \ No newline at end of file
+14.5.2 \ 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 43d7c0cdae..a21f928b08 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.1".freeze
+ VERSION = "14.5.2".freeze
end
#
diff --git a/lib/chef/version.rb b/lib/chef/version.rb
index 8821414eed..e465440ee3 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.1")
+ VERSION = Chef::VersionString.new("14.5.2")
end
#