summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChef Expeditor <expeditor@chef.io>2020-04-07 00:13:55 +0000
committerChef Expeditor <expeditor@chef.io>2020-04-07 00:13:55 +0000
commit7a98d77edfb73920122dc6ea4832a57e00852adb (patch)
tree373cdda2c856e90d7c45711b87ac69c7c0712459
parent0a1c2e049a3cc4000acfb4c661cb955e0eadd916 (diff)
downloadchef-7a98d77edfb73920122dc6ea4832a57e00852adb.tar.gz
Bump version to 14.15.2 by Chef Expeditorv14.15.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 167cd22f9c..4808a8b4d3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,15 +1,16 @@
<!-- usage documentation: http://expeditor-docs.es.chef.io/configuration/changelog/ -->
-<!-- latest_release 14.15.0 -->
-## [v14.15.0](https://github.com/chef/chef/tree/v14.15.0) (2020-04-05)
+<!-- latest_release 14.15.2 -->
+## [v14.15.2](https://github.com/chef/chef/tree/v14.15.2) (2020-04-07)
#### Merged Pull Requests
-- Backport windows_task PR #8420 and #9223 [#9601](https://github.com/chef/chef/pull/9601) ([Vasu1105](https://github.com/Vasu1105))
+- 14: Really skip the reboot pending func test if a reboot is pending [#9612](https://github.com/chef/chef/pull/9612) ([btm](https://github.com/btm))
<!-- latest_release -->
<!-- release_rollup since=14.14.29 -->
### Changes not yet released to stable
#### Merged Pull Requests
+- 14: Really skip the reboot pending func test if a reboot is pending [#9612](https://github.com/chef/chef/pull/9612) ([btm](https://github.com/btm)) <!-- 14.15.2 -->
- Backport windows_task PR #8420 and #9223 [#9601](https://github.com/chef/chef/pull/9601) ([Vasu1105](https://github.com/Vasu1105)) <!-- 14.15.0 -->
- debian 10 ifconfig fix [#9599](https://github.com/chef/chef/pull/9599) ([btm](https://github.com/btm)) <!-- 14.14.49 -->
- Match platforms to chef-15 [#9598](https://github.com/chef/chef/pull/9598) ([btm](https://github.com/btm)) <!-- 14.14.48 -->
diff --git a/Gemfile.lock b/Gemfile.lock
index c89fe3c8cb..612f0a23e3 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,10 +1,10 @@
PATH
remote: .
specs:
- chef (14.15.1)
+ chef (14.15.2)
addressable
bundler (>= 1.10)
- chef-config (= 14.15.1)
+ chef-config (= 14.15.2)
chef-zero (>= 13.0, < 15.0)
diff-lcs (~> 1.2, >= 1.2.4)
erubis (~> 2.7)
@@ -31,10 +31,10 @@ PATH
specinfra (~> 2.10)
syslog-logger (~> 1.6)
uuidtools (~> 2.1.5)
- chef (14.15.1-universal-mingw32)
+ chef (14.15.2-universal-mingw32)
addressable
bundler (>= 1.10)
- chef-config (= 14.15.1)
+ chef-config (= 14.15.2)
chef-zero (>= 13.0, < 15.0)
diff-lcs (~> 1.2, >= 1.2.4)
erubis (~> 2.7)
@@ -77,7 +77,7 @@ PATH
PATH
remote: chef-config
specs:
- chef-config (14.15.1)
+ chef-config (14.15.2)
addressable
fuzzyurl
mixlib-config (>= 2.2.12, < 4.0)
diff --git a/VERSION b/VERSION
index 7c6b4259b1..6ef2e7fea1 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-14.15.1 \ No newline at end of file
+14.15.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 6b89a0c5ce..48dac8013c 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.15.1".freeze
+ VERSION = "14.15.2".freeze
end
#
diff --git a/lib/chef/version.rb b/lib/chef/version.rb
index 9b76d384e9..fc1939977f 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.15.1")
+ VERSION = Chef::VersionString.new("14.15.2")
end
#