summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--CHANGELOG.md7
-rw-r--r--Gemfile.lock24
-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--knife/lib/chef/knife/version.rb2
-rw-r--r--lib/chef/version.rb2
8 files changed, 22 insertions, 21 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 23317464da..568bca318a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,17 +1,18 @@
<!-- 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.35 -->
-## [v17.10.35](https://github.com/chef/chef/tree/v17.10.35) (2023-02-28)
+<!-- latest_release 17.10.36 -->
+## [v17.10.36](https://github.com/chef/chef/tree/v17.10.36) (2023-03-01)
#### Merged Pull Requests
-- Fix rubygem tests for 17 [#13615](https://github.com/chef/chef/pull/13615) ([jaymzh](https://github.com/jaymzh))
+- [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))
<!-- latest_release -->
<!-- release_rollup since=17.10.0 -->
### Changes not yet released to stable
#### Merged Pull Requests
+- [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 -->
- [chef-17] backport Bump deps for net-ssh 7.x for RHEL 9 and Ubuntu 22.04 ssh [#13332](https://github.com/chef/chef/pull/13332) ([Stromweld](https://github.com/Stromweld)) <!-- 17.10.34 -->
- Bump chef-vault to 4.1.11 [#13583](https://github.com/chef/chef/pull/13583) ([chef-expeditor[bot]](https://github.com/chef-expeditor[bot])) <!-- 17.10.33 -->
diff --git a/Gemfile.lock b/Gemfile.lock
index f70e3492d8..b13b3d8315 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -35,12 +35,12 @@ GIT
PATH
remote: .
specs:
- chef (17.10.35)
+ chef (17.10.36)
addressable
aws-sdk-s3 (~> 1.91)
aws-sdk-secretsmanager (~> 1.46)
- chef-config (= 17.10.35)
- chef-utils (= 17.10.35)
+ chef-config (= 17.10.36)
+ chef-utils (= 17.10.36)
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.35-universal-mingw32)
+ chef (17.10.36-universal-mingw32)
addressable
aws-sdk-s3 (~> 1.91)
aws-sdk-secretsmanager (~> 1.46)
- chef-config (= 17.10.35)
+ chef-config (= 17.10.36)
chef-powershell (~> 1.0.12)
- chef-utils (= 17.10.35)
+ chef-utils (= 17.10.36)
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.35)
- chef (= 17.10.35)
+ chef-bin (17.10.36)
+ chef (= 17.10.36)
PATH
remote: chef-config
specs:
- chef-config (17.10.35)
+ chef-config (17.10.36)
addressable
- chef-utils (= 17.10.35)
+ chef-utils (= 17.10.36)
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.35)
+ chef-utils (17.10.36)
concurrent-ruby
GEM
@@ -165,7 +165,7 @@ GEM
debug_inspector (>= 0.0.1)
builder (3.2.4)
byebug (11.1.3)
- chef-powershell (1.0.19)
+ chef-powershell (1.0.13)
ffi (~> 1.15)
ffi-yajl (~> 2.4)
chef-telemetry (1.1.1)
diff --git a/VERSION b/VERSION
index b30b75103a..7da289b089 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-17.10.35 \ No newline at end of file
+17.10.36 \ 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 eef02fcb67..f1a61f9f62 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.35".freeze
+ VERSION = "17.10.36".freeze
end
#
diff --git a/chef-config/lib/chef-config/version.rb b/chef-config/lib/chef-config/version.rb
index 12b935bae2..ad918dd349 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.35".freeze
+ VERSION = "17.10.36".freeze
end
diff --git a/chef-utils/lib/chef-utils/version.rb b/chef-utils/lib/chef-utils/version.rb
index 24f7b44fc6..770094dc45 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.35"
+ VERSION = "17.10.36"
end
diff --git a/knife/lib/chef/knife/version.rb b/knife/lib/chef/knife/version.rb
index 4f668ef392..cd3734e87f 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.35".freeze
+ VERSION = "17.10.36".freeze
end
end
diff --git a/lib/chef/version.rb b/lib/chef/version.rb
index d6ba57c155..e1088f83e1 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.35")
+ VERSION = Chef::VersionString.new("17.10.36")
end
#