diff options
author | John McCrae <john.mccrae@progress.com> | 2023-04-26 07:53:10 +0600 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-04-26 07:53:10 +0600 |
commit | 3576da06b766c6b252118976dba7757009d2cbd6 (patch) | |
tree | 6eaf734a48d710f22510c4b6ed38d60d54a82bd7 | |
parent | 040b865a841bb813829f74ffcfb8d9b7fe7ec09e (diff) | |
parent | 13a19f53a8e2acfbe995af5bf0e677f1d89e3ae8 (diff) | |
download | chef-3576da06b766c6b252118976dba7757009d2cbd6.tar.gz |
Merge branch 'chef-17' into jfm/chef17_knife_gem
-rw-r--r-- | CHANGELOG.md | 8 | ||||
-rw-r--r-- | Gemfile.lock | 24 | ||||
-rw-r--r-- | VERSION | 2 | ||||
-rw-r--r-- | chef-bin/lib/chef-bin/version.rb | 2 | ||||
-rw-r--r-- | chef-config/lib/chef-config/version.rb | 2 | ||||
-rw-r--r-- | chef-utils/lib/chef-utils/version.rb | 2 | ||||
-rw-r--r-- | knife/lib/chef/knife/version.rb | 2 | ||||
-rw-r--r-- | lib/chef/version.rb | 2 |
8 files changed, 23 insertions, 21 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 0609774017..d2d3c52fa4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,17 +1,19 @@ <!-- 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.10.53 --> -## [v17.10.53](https://github.com/chef/chef/tree/v17.10.53) (2023-04-25) + +<!-- latest_release 17.10.54 --> +## [v17.10.54](https://github.com/chef/chef/tree/v17.10.54) (2023-04-26) #### Merged Pull Requests -- Updating the badssl cert again [#13713](https://github.com/chef/chef/pull/13713) ([johnmccrae](https://github.com/johnmccrae)) +- [Chef-17] 12 of X - Correcting Windows Verify Plan failures [#13710](https://github.com/chef/chef/pull/13710) ([johnmccrae](https://github.com/johnmccrae)) <!-- latest_release --> <!-- release_rollup since=17.10.0 --> ### Changes not yet released to stable #### Merged Pull Requests +- [Chef-17] 12 of X - Correcting Windows Verify Plan failures [#13710](https://github.com/chef/chef/pull/13710) ([johnmccrae](https://github.com/johnmccrae)) <!-- 17.10.54 --> - Updating the badssl cert again [#13713](https://github.com/chef/chef/pull/13713) ([johnmccrae](https://github.com/johnmccrae)) <!-- 17.10.53 --> - [Chef-17] 10 of X - Updating gem dependencies [#13708](https://github.com/chef/chef/pull/13708) ([johnmccrae](https://github.com/johnmccrae)) <!-- 17.10.52 --> - [Chef-17] 11 of X - Updating windows_font_spec [#13709](https://github.com/chef/chef/pull/13709) ([johnmccrae](https://github.com/johnmccrae)) <!-- 17.10.51 --> diff --git a/Gemfile.lock b/Gemfile.lock index 0b5cac413e..901b1456fb 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -35,12 +35,12 @@ GIT PATH remote: . specs: - chef (17.10.53) + chef (17.10.54) addressable aws-sdk-s3 (~> 1.91) aws-sdk-secretsmanager (~> 1.46) - chef-config (= 17.10.53) - chef-utils (= 17.10.53) + chef-config (= 17.10.54) + chef-utils (= 17.10.54) chef-vault chef-zero (>= 14.0.11) corefoundation (~> 0.3.4) @@ -66,13 +66,13 @@ PATH train-winrm (>= 0.2.5) uuidtools (>= 2.1.5, < 3.0) vault (~> 0.16) - chef (17.10.53-universal-mingw32) + chef (17.10.54-universal-mingw32) addressable aws-sdk-s3 (~> 1.91) aws-sdk-secretsmanager (~> 1.46) - chef-config (= 17.10.53) + chef-config (= 17.10.54) chef-powershell (~> 1.0.12) - chef-utils (= 17.10.53) + chef-utils (= 17.10.54) chef-vault chef-zero (>= 14.0.11) corefoundation (~> 0.3.4) @@ -113,15 +113,15 @@ PATH PATH remote: chef-bin specs: - chef-bin (17.10.53) - chef (= 17.10.53) + chef-bin (17.10.54) + chef (= 17.10.54) PATH remote: chef-config specs: - chef-config (17.10.53) + chef-config (17.10.54) addressable - chef-utils (= 17.10.53) + chef-utils (= 17.10.54) fuzzyurl mixlib-config (>= 2.2.12, < 4.0) mixlib-shellout (>= 2.0, < 4.0) @@ -130,7 +130,7 @@ PATH PATH remote: chef-utils specs: - chef-utils (17.10.53) + chef-utils (17.10.54) concurrent-ruby GEM @@ -143,7 +143,7 @@ GEM mixlib-shellout (>= 2.0, < 4.0) ast (2.4.2) aws-eventstream (1.2.0) - aws-partitions (1.753.0) + aws-partitions (1.754.0) aws-sdk-core (3.171.0) aws-eventstream (~> 1, >= 1.0.2) aws-partitions (~> 1, >= 1.651.0) @@ -1 +1 @@ -17.10.53
\ No newline at end of file +17.10.54 diff --git a/chef-bin/lib/chef-bin/version.rb b/chef-bin/lib/chef-bin/version.rb index ac0abb9b73..1e041535c0 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.10.53".freeze + VERSION = "17.10.54".freeze end # diff --git a/chef-config/lib/chef-config/version.rb b/chef-config/lib/chef-config/version.rb index e3f27bc090..3df056b0d7 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.10.53".freeze + VERSION = "17.10.54".freeze end diff --git a/chef-utils/lib/chef-utils/version.rb b/chef-utils/lib/chef-utils/version.rb index 473468cf99..2f5d0ceb46 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.10.53" + VERSION = "17.10.54" end diff --git a/knife/lib/chef/knife/version.rb b/knife/lib/chef/knife/version.rb index 265e3f3f6b..4c175395df 100644 --- a/knife/lib/chef/knife/version.rb +++ b/knife/lib/chef/knife/version.rb @@ -17,7 +17,7 @@ class Chef class Knife KNIFE_ROOT = File.expand_path("../..", __dir__) - VERSION = "17.10.53".freeze + VERSION = "17.10.54".freeze end end diff --git a/lib/chef/version.rb b/lib/chef/version.rb index ec3cccf555..2bef61ae7a 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.10.53") + VERSION = Chef::VersionString.new("17.10.54") end # |