summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChef Expeditor <chef-ci@chef.io>2020-09-10 21:10:55 +0000
committerChef Expeditor <chef-ci@chef.io>2020-09-10 21:10:55 +0000
commit55167acc37a66499247a7cf0af3d41fd828fc22a (patch)
treeb33ea5f2d26259cb7cf6b071c736be9b7bb1be16
parent40f9d99aef12c5ee6c2b322ef2f451d65fbfb6f9 (diff)
downloadchef-55167acc37a66499247a7cf0af3d41fd828fc22a.tar.gz
Bump version to 15.13.21 by Chef Expeditorv15.13.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 e8000b77df..fe3e494e27 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,15 +1,16 @@
<!-- usage documentation: http://expeditor-docs.es.chef.io/configuration/changelog/ -->
-<!-- latest_release 15.13.20 -->
-## [v15.13.20](https://github.com/chef/chef/tree/v15.13.20) (2020-09-10)
+<!-- latest_release 15.13.21 -->
+## [v15.13.21](https://github.com/chef/chef/tree/v15.13.21) (2020-09-10)
#### Merged Pull Requests
-- Update openssl to 1.0.2w and bump other deps to current [#10415](https://github.com/chef/chef/pull/10415) ([tas50](https://github.com/tas50))
+- Add SLES 15 S390x builds [#10417](https://github.com/chef/chef/pull/10417) ([tas50](https://github.com/tas50))
<!-- latest_release -->
<!-- release_rollup since=15.13.8 -->
### Changes not yet released to stable
#### Merged Pull Requests
+- Add SLES 15 S390x builds [#10417](https://github.com/chef/chef/pull/10417) ([tas50](https://github.com/tas50)) <!-- 15.13.21 -->
- Update openssl to 1.0.2w and bump other deps to current [#10415](https://github.com/chef/chef/pull/10415) ([tas50](https://github.com/tas50)) <!-- 15.13.20 -->
- Simplify macos platform detection in the specs + add macOS Big Sur testers [#10378](https://github.com/chef/chef/pull/10378) ([tas50](https://github.com/tas50)) <!-- 15.13.19 -->
- Avoid knife ssh freeze on windows [#10377](https://github.com/chef/chef/pull/10377) ([tas50](https://github.com/tas50)) <!-- 15.13.18 -->
diff --git a/Gemfile.lock b/Gemfile.lock
index 28334c0b0f..4741940065 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -19,12 +19,12 @@ GIT
PATH
remote: .
specs:
- chef (15.13.20)
+ chef (15.13.21)
addressable
bcrypt_pbkdf (~> 1.0)
bundler (>= 1.10)
- chef-config (= 15.13.20)
- chef-utils (= 15.13.20)
+ chef-config (= 15.13.21)
+ chef-utils (= 15.13.21)
chef-zero (>= 14.0.11)
diff-lcs (~> 1.2, >= 1.2.4)
ed25519 (~> 1.2)
@@ -51,12 +51,12 @@ PATH
train-winrm (>= 0.2.5)
tty-screen (~> 0.6)
uuidtools (~> 2.1.5)
- chef (15.13.20-universal-mingw32)
+ chef (15.13.21-universal-mingw32)
addressable
bcrypt_pbkdf (~> 1.0)
bundler (>= 1.10)
- chef-config (= 15.13.20)
- chef-utils (= 15.13.20)
+ chef-config (= 15.13.21)
+ chef-utils (= 15.13.21)
chef-zero (>= 14.0.11)
diff-lcs (~> 1.2, >= 1.2.4)
ed25519 (~> 1.2)
@@ -99,15 +99,15 @@ PATH
PATH
remote: chef-bin
specs:
- chef-bin (15.13.20)
- chef (= 15.13.20)
+ chef-bin (15.13.21)
+ chef (= 15.13.21)
PATH
remote: chef-config
specs:
- chef-config (15.13.20)
+ chef-config (15.13.21)
addressable
- chef-utils (= 15.13.20)
+ chef-utils (= 15.13.21)
fuzzyurl
mixlib-config (>= 2.2.12, < 4.0)
mixlib-shellout (>= 2.0, < 4.0)
@@ -116,7 +116,7 @@ PATH
PATH
remote: chef-utils
specs:
- chef-utils (15.13.20)
+ chef-utils (15.13.21)
GEM
remote: https://rubygems.org/
diff --git a/VERSION b/VERSION
index b6c2c23d6e..37f1f9db61 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-15.13.20 \ No newline at end of file
+15.13.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 f26814b7dc..8e4b66c681 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("..", __dir__)
- VERSION = "15.13.20".freeze
+ VERSION = "15.13.21".freeze
end
#
diff --git a/chef-config/lib/chef-config/version.rb b/chef-config/lib/chef-config/version.rb
index 6ea7a5f99e..194c7cf98b 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("..", __dir__)
- VERSION = "15.13.20".freeze
+ VERSION = "15.13.21".freeze
end
diff --git a/chef-utils/lib/chef-utils/version.rb b/chef-utils/lib/chef-utils/version.rb
index 38dd617f78..964bd8dcc3 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("..", __dir__)
- VERSION = "15.13.20".freeze
+ VERSION = "15.13.21".freeze
end
diff --git a/lib/chef/version.rb b/lib/chef/version.rb
index d303ee6698..29b3c05b64 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("..", __dir__)
- VERSION = Chef::VersionString.new("15.13.20")
+ VERSION = Chef::VersionString.new("15.13.21")
end
#