summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChef Expeditor <expeditor@chef.io>2020-04-07 00:14:28 +0000
committerChef Expeditor <expeditor@chef.io>2020-04-07 00:14:28 +0000
commit73b23a8af478fd434b9f2ecac1b4552924c5008d (patch)
tree995fd5af62941a5a202b2fe48bd119f24c4f36b3
parentc03cd33e049b9f7e1bd92a0c2f659b4671592bb8 (diff)
downloadchef-73b23a8af478fd434b9f2ecac1b4552924c5008d.tar.gz
Bump version to 15.9.20 by Chef Expeditorv15.9.20
Obvious fix; these changes are the result of automation not creative thinking.
-rw-r--r--CHANGELOG.md7
-rw-r--r--Gemfile.lock22
-rw-r--r--VERSION2
-rw-r--r--chef-bin/lib/chef-bin/version.rb2
-rw-r--r--chef-config/lib/chef-config/version.rb2
-rw-r--r--chef-utils/lib/chef-utils/version.rb2
-rw-r--r--lib/chef/version.rb2
7 files changed, 20 insertions, 19 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 85d7f3e3df..5c7c97e8b0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,15 +1,16 @@
<!-- usage documentation: http://expeditor-docs.es.chef.io/configuration/changelog/ -->
-<!-- latest_release 15.9.19 -->
-## [v15.9.19](https://github.com/chef/chef/tree/v15.9.19) (2020-04-07)
+<!-- latest_release 15.9.20 -->
+## [v15.9.20](https://github.com/chef/chef/tree/v15.9.20) (2020-04-07)
#### Merged Pull Requests
-- 15 backport: Improved Ruby download/install for functional tests [#9604](https://github.com/chef/chef/pull/9604) ([btm](https://github.com/btm))
+- 15: Really skip the reboot pending func test if a reboot is pending [#9613](https://github.com/chef/chef/pull/9613) ([btm](https://github.com/btm))
<!-- latest_release -->
<!-- release_rollup since=15.9.17 -->
### Changes not yet released to stable
#### Merged Pull Requests
+- 15: Really skip the reboot pending func test if a reboot is pending [#9613](https://github.com/chef/chef/pull/9613) ([btm](https://github.com/btm)) <!-- 15.9.20 -->
- 15 backport: Improved Ruby download/install for functional tests [#9604](https://github.com/chef/chef/pull/9604) ([btm](https://github.com/btm)) <!-- 15.9.19 -->
- 15: Use $env:temp instead of c:/ for functional tests [#9592](https://github.com/chef/chef/pull/9592) ([btm](https://github.com/btm)) <!-- 15.9.18 -->
<!-- release_rollup -->
diff --git a/Gemfile.lock b/Gemfile.lock
index c79be62949..6780e97583 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -27,12 +27,12 @@ GIT
PATH
remote: .
specs:
- chef (15.9.19)
+ chef (15.9.20)
addressable
bcrypt_pbkdf (~> 1.0)
bundler (>= 1.10)
- chef-config (= 15.9.19)
- chef-utils (= 15.9.19)
+ chef-config (= 15.9.20)
+ chef-utils (= 15.9.20)
chef-zero (>= 14.0.11)
diff-lcs (~> 1.2, >= 1.2.4)
ed25519 (~> 1.2)
@@ -59,12 +59,12 @@ PATH
train-winrm (>= 0.2.5)
tty-screen (~> 0.6)
uuidtools (~> 2.1.5)
- chef (15.9.19-universal-mingw32)
+ chef (15.9.20-universal-mingw32)
addressable
bcrypt_pbkdf (~> 1.0)
bundler (>= 1.10)
- chef-config (= 15.9.19)
- chef-utils (= 15.9.19)
+ chef-config (= 15.9.20)
+ chef-utils (= 15.9.20)
chef-zero (>= 14.0.11)
diff-lcs (~> 1.2, >= 1.2.4)
ed25519 (~> 1.2)
@@ -107,15 +107,15 @@ PATH
PATH
remote: chef-bin
specs:
- chef-bin (15.9.19)
- chef (= 15.9.19)
+ chef-bin (15.9.20)
+ chef (= 15.9.20)
PATH
remote: chef-config
specs:
- chef-config (15.9.19)
+ chef-config (15.9.20)
addressable
- chef-utils (= 15.9.19)
+ chef-utils (= 15.9.20)
fuzzyurl
mixlib-config (>= 2.2.12, < 4.0)
mixlib-shellout (>= 2.0, < 4.0)
@@ -124,7 +124,7 @@ PATH
PATH
remote: chef-utils
specs:
- chef-utils (15.9.19)
+ chef-utils (15.9.20)
GEM
remote: https://rubygems.org/
diff --git a/VERSION b/VERSION
index 5b169bce34..8ef79d61d7 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-15.9.19 \ No newline at end of file
+15.9.20 \ No newline at end of file
diff --git a/chef-bin/lib/chef-bin/version.rb b/chef-bin/lib/chef-bin/version.rb
index ab05a9e3c5..a7caec99d2 100644
--- a/chef-bin/lib/chef-bin/version.rb
+++ b/chef-bin/lib/chef-bin/version.rb
@@ -21,7 +21,7 @@
module ChefBin
CHEFBIN_ROOT = File.expand_path("../..", __FILE__)
- VERSION = "15.9.19".freeze
+ VERSION = "15.9.20".freeze
end
#
diff --git a/chef-config/lib/chef-config/version.rb b/chef-config/lib/chef-config/version.rb
index 1b85f6c6e8..598e6ee5d3 100644
--- a/chef-config/lib/chef-config/version.rb
+++ b/chef-config/lib/chef-config/version.rb
@@ -15,5 +15,5 @@
module ChefConfig
CHEFCONFIG_ROOT = File.expand_path("../..", __FILE__)
- VERSION = "15.9.19".freeze
+ VERSION = "15.9.20".freeze
end
diff --git a/chef-utils/lib/chef-utils/version.rb b/chef-utils/lib/chef-utils/version.rb
index 98a684fdb8..3d64ddc2e4 100644
--- a/chef-utils/lib/chef-utils/version.rb
+++ b/chef-utils/lib/chef-utils/version.rb
@@ -15,5 +15,5 @@
module ChefUtils
CHEFUTILS_ROOT = File.expand_path("../..", __FILE__)
- VERSION = "15.9.19".freeze
+ VERSION = "15.9.20".freeze
end
diff --git a/lib/chef/version.rb b/lib/chef/version.rb
index e1a009a6ad..f3d9f06a74 100644
--- a/lib/chef/version.rb
+++ b/lib/chef/version.rb
@@ -23,7 +23,7 @@ require_relative "version_string"
class Chef
CHEF_ROOT = File.expand_path("../..", __FILE__)
- VERSION = Chef::VersionString.new("15.9.19")
+ VERSION = Chef::VersionString.new("15.9.20")
end
#