summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChef Expeditor <expeditor@chef.io>2020-04-08 16:38:18 +0000
committerChef Expeditor <expeditor@chef.io>2020-04-08 16:38:18 +0000
commit7e399435937d6bb7a73b50b54938863e5e482920 (patch)
tree753b228608cef47aa3e6ff2cb90a79b18ecac739
parent097b035f258128289b9695cb40d5c445b276141f (diff)
downloadchef-7e399435937d6bb7a73b50b54938863e5e482920.tar.gz
Bump version to 15.9.21 by Chef Expeditorv15.9.21
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 5c7c97e8b0..2622a67328 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.20 -->
-## [v15.9.20](https://github.com/chef/chef/tree/v15.9.20) (2020-04-07)
+<!-- latest_release 15.9.21 -->
+## [v15.9.21](https://github.com/chef/chef/tree/v15.9.21) (2020-04-08)
#### 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))
+- Update InSpec to 4.18.104 [#9629](https://github.com/chef/chef/pull/9629) ([tas50](https://github.com/tas50))
<!-- latest_release -->
<!-- release_rollup since=15.9.17 -->
### Changes not yet released to stable
#### Merged Pull Requests
+- Update InSpec to 4.18.104 [#9629](https://github.com/chef/chef/pull/9629) ([tas50](https://github.com/tas50)) <!-- 15.9.21 -->
- 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 -->
diff --git a/Gemfile.lock b/Gemfile.lock
index fc071095ad..f987a0af15 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -27,12 +27,12 @@ GIT
PATH
remote: .
specs:
- chef (15.9.20)
+ chef (15.9.21)
addressable
bcrypt_pbkdf (~> 1.0)
bundler (>= 1.10)
- chef-config (= 15.9.20)
- chef-utils (= 15.9.20)
+ chef-config (= 15.9.21)
+ chef-utils (= 15.9.21)
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.20-universal-mingw32)
+ chef (15.9.21-universal-mingw32)
addressable
bcrypt_pbkdf (~> 1.0)
bundler (>= 1.10)
- chef-config (= 15.9.20)
- chef-utils (= 15.9.20)
+ chef-config (= 15.9.21)
+ chef-utils (= 15.9.21)
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.20)
- chef (= 15.9.20)
+ chef-bin (15.9.21)
+ chef (= 15.9.21)
PATH
remote: chef-config
specs:
- chef-config (15.9.20)
+ chef-config (15.9.21)
addressable
- chef-utils (= 15.9.20)
+ chef-utils (= 15.9.21)
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.20)
+ chef-utils (15.9.21)
GEM
remote: https://rubygems.org/
diff --git a/VERSION b/VERSION
index 8ef79d61d7..95e71db38e 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-15.9.20 \ No newline at end of file
+15.9.21 \ 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 a7caec99d2..0d2111b290 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.20".freeze
+ VERSION = "15.9.21".freeze
end
#
diff --git a/chef-config/lib/chef-config/version.rb b/chef-config/lib/chef-config/version.rb
index 598e6ee5d3..94574b9bc4 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.20".freeze
+ VERSION = "15.9.21".freeze
end
diff --git a/chef-utils/lib/chef-utils/version.rb b/chef-utils/lib/chef-utils/version.rb
index 3d64ddc2e4..d94e2e7c86 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.20".freeze
+ VERSION = "15.9.21".freeze
end
diff --git a/lib/chef/version.rb b/lib/chef/version.rb
index f3d9f06a74..2c3480c5b1 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.20")
+ VERSION = Chef::VersionString.new("15.9.21")
end
#