summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChef Expeditor <chef-ci@chef.io>2020-10-16 21:54:46 +0000
committerChef Expeditor <chef-ci@chef.io>2020-10-16 21:54:46 +0000
commit932227d4838150303403765a901e92257ba67564 (patch)
tree1e0863c31cbab171480f5e94780572b0e4515096
parent073be3666d1bf7480ec9a2f40291b2ed0fc691a1 (diff)
downloadchef-932227d4838150303403765a901e92257ba67564.tar.gz
Bump version to 16.6.21 by Chef Expeditorv16.6.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 42558086a9..e348312921 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,15 +1,16 @@
<!-- usage documentation: http://expeditor-docs.es.chef.io/configuration/changelog/ -->
-<!-- latest_release 16.6.20 -->
-## [v16.6.20](https://github.com/chef/chef/tree/v16.6.20) (2020-10-16)
+<!-- latest_release 16.6.21 -->
+## [v16.6.21](https://github.com/chef/chef/tree/v16.6.21) (2020-10-16)
#### Merged Pull Requests
-- Avoid using complex regexes when we can use include? [#10516](https://github.com/chef/chef/pull/10516) ([tas50](https://github.com/tas50))
+- Fix bad formatting in a deprecation message [#10521](https://github.com/chef/chef/pull/10521) ([tas50](https://github.com/tas50))
<!-- latest_release -->
<!-- release_rollup since=16.6.14 -->
### Changes not yet released to stable
#### Merged Pull Requests
+- Fix bad formatting in a deprecation message [#10521](https://github.com/chef/chef/pull/10521) ([tas50](https://github.com/tas50)) <!-- 16.6.21 -->
- Avoid using complex regexes when we can use include? [#10516](https://github.com/chef/chef/pull/10516) ([tas50](https://github.com/tas50)) <!-- 16.6.20 -->
- Avoid a slow hash merge [#10517](https://github.com/chef/chef/pull/10517) ([tas50](https://github.com/tas50)) <!-- 16.6.19 -->
- Update docs generation task to handle Chef 16 required format [#10518](https://github.com/chef/chef/pull/10518) ([tas50](https://github.com/tas50)) <!-- 16.6.18 -->
diff --git a/Gemfile.lock b/Gemfile.lock
index 9fdc32636b..85b6401b28 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -28,12 +28,12 @@ GIT
PATH
remote: .
specs:
- chef (16.6.20)
+ chef (16.6.21)
addressable
bcrypt_pbkdf (= 1.1.0.rc1)
bundler (>= 1.10)
- chef-config (= 16.6.20)
- chef-utils (= 16.6.20)
+ chef-config (= 16.6.21)
+ chef-utils (= 16.6.21)
chef-vault
chef-zero (>= 14.0.11)
diff-lcs (>= 1.2.4, < 1.4.0)
@@ -64,12 +64,12 @@ PATH
tty-screen (~> 0.6)
tty-table (~> 0.11)
uuidtools (~> 2.1.5)
- chef (16.6.20-universal-mingw32)
+ chef (16.6.21-universal-mingw32)
addressable
bcrypt_pbkdf (= 1.1.0.rc1)
bundler (>= 1.10)
- chef-config (= 16.6.20)
- chef-utils (= 16.6.20)
+ chef-config (= 16.6.21)
+ chef-utils (= 16.6.21)
chef-vault
chef-zero (>= 14.0.11)
diff-lcs (>= 1.2.4, < 1.4.0)
@@ -115,15 +115,15 @@ PATH
PATH
remote: chef-bin
specs:
- chef-bin (16.6.20)
- chef (= 16.6.20)
+ chef-bin (16.6.21)
+ chef (= 16.6.21)
PATH
remote: chef-config
specs:
- chef-config (16.6.20)
+ chef-config (16.6.21)
addressable
- chef-utils (= 16.6.20)
+ chef-utils (= 16.6.21)
fuzzyurl
mixlib-config (>= 2.2.12, < 4.0)
mixlib-shellout (>= 2.0, < 4.0)
@@ -132,7 +132,7 @@ PATH
PATH
remote: chef-utils
specs:
- chef-utils (16.6.20)
+ chef-utils (16.6.21)
GEM
remote: https://rubygems.org/
diff --git a/VERSION b/VERSION
index 6ae265e4a6..903e4f0fc8 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-16.6.20 \ No newline at end of file
+16.6.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 f7775d12ad..3e1d0ba268 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 = "16.6.20".freeze
+ VERSION = "16.6.21".freeze
end
#
diff --git a/chef-config/lib/chef-config/version.rb b/chef-config/lib/chef-config/version.rb
index 49c4d6397b..dc4c400e70 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 = "16.6.20".freeze
+ VERSION = "16.6.21".freeze
end
diff --git a/chef-utils/lib/chef-utils/version.rb b/chef-utils/lib/chef-utils/version.rb
index 6ac89d2ea8..ec535b7f45 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 = "16.6.20".freeze
+ VERSION = "16.6.21".freeze
end
diff --git a/lib/chef/version.rb b/lib/chef/version.rb
index ea80ffd6d0..15839d88de 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("16.6.20")
+ VERSION = Chef::VersionString.new("16.6.21")
end
#