summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Smith <tsmith@chef.io>2020-12-31 14:19:50 -0800
committerGitHub <noreply@github.com>2020-12-31 14:19:50 -0800
commitdcc29cad43e3fd1d97d5b9181a1a520dc5f41431 (patch)
tree889ccb833550c6b97cb2443ffd844579e9030125
parentf71875c828112448f983f466e89d12debbf150e7 (diff)
parent1d1b7fa20c4c1bb5165eb51af17af99559ab1f2f (diff)
downloadchef-dcc29cad43e3fd1d97d5b9181a1a520dc5f41431.tar.gz
Merge branch 'master' into metadata
-rw-r--r--CHANGELOG.md9
-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, 22 insertions, 19 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index f4174defba..7c41fd500c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,17 +1,20 @@
<!-- usage documentation: http://expeditor-docs.es.chef.io/configuration/changelog/ -->
This changelog lists individual merged pull requests to Chef Infra Client and geared towards developers. For a list of significant changes per release see the [Chef Infra Client Release Notes](https://docs.chef.io/release_notes_client/).
-<!-- latest_release 17.0.20 -->
-## [v17.0.20](https://github.com/chef/chef/tree/v17.0.20) (2020-12-31)
+<!-- latest_release 17.0.23 -->
+## [v17.0.23](https://github.com/chef/chef/tree/v17.0.23) (2020-12-31)
#### Merged Pull Requests
-- Remove the evals in the omnibus gemfile for Dependabot [#10805](https://github.com/chef/chef/pull/10805) ([tas50](https://github.com/tas50))
+- Bump omnibus from `d13ae16` to `44f1303` in /omnibus [#10806](https://github.com/chef/chef/pull/10806) ([dependabot-preview[bot]](https://github.com/dependabot-preview[bot]))
<!-- latest_release -->
<!-- release_rollup since=16.8.14 -->
### Changes not yet released to stable
#### Merged Pull Requests
+- Bump omnibus from `d13ae16` to `44f1303` in /omnibus [#10806](https://github.com/chef/chef/pull/10806) ([dependabot-preview[bot]](https://github.com/dependabot-preview[bot])) <!-- 17.0.23 -->
+- Bump omnibus-software from `457df26` to `869ef4e` in /omnibus [#10808](https://github.com/chef/chef/pull/10808) ([dependabot-preview[bot]](https://github.com/dependabot-preview[bot])) <!-- 17.0.22 -->
+- Bump test-kitchen from 2.8.0 to 2.9.0 in /omnibus [#10807](https://github.com/chef/chef/pull/10807) ([dependabot-preview[bot]](https://github.com/dependabot-preview[bot])) <!-- 17.0.21 -->
- Remove the evals in the omnibus gemfile for Dependabot [#10805](https://github.com/chef/chef/pull/10805) ([tas50](https://github.com/tas50)) <!-- 17.0.20 -->
- Update bcrypt_pbkdf to support Ruby 3 [#10804](https://github.com/chef/chef/pull/10804) ([tas50](https://github.com/tas50)) <!-- 17.0.19 -->
- Remove the runtime dep on bundler [#10801](https://github.com/chef/chef/pull/10801) ([tas50](https://github.com/tas50)) <!-- 17.0.18 -->
diff --git a/Gemfile.lock b/Gemfile.lock
index c594e0787f..8eebf8da50 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -28,11 +28,11 @@ GIT
PATH
remote: .
specs:
- chef (17.0.20)
+ chef (17.0.23)
addressable
bcrypt_pbkdf (= 1.1.0.rc2)
- chef-config (= 17.0.20)
- chef-utils (= 17.0.20)
+ chef-config (= 17.0.23)
+ chef-utils (= 17.0.23)
chef-vault
chef-zero (>= 14.0.11)
diff-lcs (>= 1.2.4, < 1.4.0)
@@ -64,11 +64,11 @@ PATH
tty-screen (~> 0.6)
tty-table (~> 0.11)
uuidtools (~> 2.1.5)
- chef (17.0.20-universal-mingw32)
+ chef (17.0.23-universal-mingw32)
addressable
bcrypt_pbkdf (= 1.1.0.rc2)
- chef-config (= 17.0.20)
- chef-utils (= 17.0.20)
+ chef-config (= 17.0.23)
+ chef-utils (= 17.0.23)
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 (17.0.20)
- chef (= 17.0.20)
+ chef-bin (17.0.23)
+ chef (= 17.0.23)
PATH
remote: chef-config
specs:
- chef-config (17.0.20)
+ chef-config (17.0.23)
addressable
- chef-utils (= 17.0.20)
+ chef-utils (= 17.0.23)
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 (17.0.20)
+ chef-utils (17.0.23)
GEM
remote: https://rubygems.org/
diff --git a/VERSION b/VERSION
index 19304f72d8..fc374edb23 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-17.0.20 \ No newline at end of file
+17.0.23 \ 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 76f79aefbb..7bebb56f4d 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 = "17.0.20".freeze
+ VERSION = "17.0.23".freeze
end
#
diff --git a/chef-config/lib/chef-config/version.rb b/chef-config/lib/chef-config/version.rb
index c56018f8dd..57ec965b44 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 = "17.0.20".freeze
+ VERSION = "17.0.23".freeze
end
diff --git a/chef-utils/lib/chef-utils/version.rb b/chef-utils/lib/chef-utils/version.rb
index 67d29c8889..0d5bb5abbb 100644
--- a/chef-utils/lib/chef-utils/version.rb
+++ b/chef-utils/lib/chef-utils/version.rb
@@ -16,5 +16,5 @@
module ChefUtils
CHEFUTILS_ROOT = File.expand_path("..", __dir__)
- VERSION = "17.0.20"
+ VERSION = "17.0.23"
end
diff --git a/lib/chef/version.rb b/lib/chef/version.rb
index 4cd168c02f..ca9212ab41 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("17.0.20")
+ VERSION = Chef::VersionString.new("17.0.23")
end
#