Merge branch 'chef-17' into jfm/chef17_test_build3jfm/chef17_test_build3

9 files changed, 24 insertions, 22 deletions

diff --git a/.expeditor/verify.pipeline.yml b/.expeditor/verify.pipeline.yml
index ca6f7b2dbe..0075679eb1 100644
--- a/.expeditor/verify.pipeline.yml
+++ b/.expeditor/verify.pipeline.yml
@@ -361,7 +361,7 @@ steps:
     - apt-get install -y graphviz
     - bundle config set --local without omnibus_package
     - bundle install --jobs=3 --retry=3
-    - bundle exec tasks/bin/run_external_test berkshelf/berkshelf main rake
+    - bundle exec tasks/bin/run_external_test chef/berkshelf main rake
   expeditor:
     executor:
       docker:
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 343ae03de8..c671c92e2b 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.37 -->
-## [v17.10.37](https://github.com/chef/chef/tree/v17.10.37) (2023-03-30)
+<!-- latest_release 17.10.39 -->
+## [v17.10.39](https://github.com/chef/chef/tree/v17.10.39) (2023-04-12)
 
 #### Merged Pull Requests
-- [Chef-17] Update ssl cert used in kitchen tests [#13660](https://github.com/chef/chef/pull/13660) ([neha-p6](https://github.com/neha-p6))
+- Fix berkshelf on chef 17 [#13679](https://github.com/chef/chef/pull/13679) ([tpowell-progress](https://github.com/tpowell-progress))
 <!-- latest_release -->
 
 <!-- release_rollup since=17.10.0 -->
 ### Changes not yet released to stable
 
 #### Merged Pull Requests
+- Fix berkshelf on chef 17 [#13679](https://github.com/chef/chef/pull/13679) ([tpowell-progress](https://github.com/tpowell-progress)) <!-- 17.10.39 -->
+- Bump addressable to 2.8.4 [#13674](https://github.com/chef/chef/pull/13674) ([chef-expeditor[bot]](https://github.com/chef-expeditor[bot])) <!-- 17.10.38 -->
 - [Chef-17] Update ssl cert used in kitchen tests [#13660](https://github.com/chef/chef/pull/13660) ([neha-p6](https://github.com/neha-p6)) <!-- 17.10.37 -->
 - [chef-17] INFC-303 - Backport changes from v18 to v17 for documentation and mis… [#13254](https://github.com/chef/chef/pull/13254) ([Stromweld](https://github.com/Stromweld)) <!-- 17.10.36 -->
 - Fix rubygem tests for 17 [#13615](https://github.com/chef/chef/pull/13615) ([jaymzh](https://github.com/jaymzh)) <!-- 17.10.35 -->
diff --git a/Gemfile.lock b/Gemfile.lock
index 96f660308b..7ff790b729 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -35,12 +35,12 @@ GIT
 PATH
   remote: .
   specs:
-    chef (17.10.37)
+    chef (17.10.39)
       addressable
       aws-sdk-s3 (~> 1.91)
       aws-sdk-secretsmanager (~> 1.46)
-      chef-config (= 17.10.37)
-      chef-utils (= 17.10.37)
+      chef-config (= 17.10.39)
+      chef-utils (= 17.10.39)
       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.37-universal-mingw32)
+    chef (17.10.39-universal-mingw32)
       addressable
       aws-sdk-s3 (~> 1.91)
       aws-sdk-secretsmanager (~> 1.46)
-      chef-config (= 17.10.37)
+      chef-config (= 17.10.39)
       chef-powershell (~> 1.0.12)
-      chef-utils (= 17.10.37)
+      chef-utils (= 17.10.39)
       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.37)
-      chef (= 17.10.37)
+    chef-bin (17.10.39)
+      chef (= 17.10.39)
 
 PATH
   remote: chef-config
   specs:
-    chef-config (17.10.37)
+    chef-config (17.10.39)
       addressable
-      chef-utils (= 17.10.37)
+      chef-utils (= 17.10.39)
       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.37)
+    chef-utils (17.10.39)
       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.744.0)
+    aws-partitions (1.745.0)
     aws-sdk-core (3.171.0)
       aws-eventstream (~> 1, >= 1.0.2)
       aws-partitions (~> 1, >= 1.651.0)
diff --git a/VERSION b/VERSION
index b68195817a..89ddd051f2 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-17.10.37
\ No newline at end of file
+17.10.39
\ 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 92cbc18453..a6ccb07283 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.37".freeze
+  VERSION = "17.10.39".freeze
 end
 
 #
diff --git a/chef-config/lib/chef-config/version.rb b/chef-config/lib/chef-config/version.rb
index 5d9280cbe3..351b785c27 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.37".freeze
+  VERSION = "17.10.39".freeze
 end
diff --git a/chef-utils/lib/chef-utils/version.rb b/chef-utils/lib/chef-utils/version.rb
index 3427ef7886..b999efe44d 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.37"
+  VERSION = "17.10.39"
 end
diff --git a/knife/lib/chef/knife/version.rb b/knife/lib/chef/knife/version.rb
index 58e3a6238f..1f3fdf8e4a 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.37".freeze
+    VERSION = "17.10.39".freeze
   end
 end
 
diff --git a/lib/chef/version.rb b/lib/chef/version.rb
index 0e446c45b3..2f3da46302 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.37")
+  VERSION = Chef::VersionString.new("17.10.39")
 end
 
 #