summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChef Expeditor <chef-ci@chef.io>2021-06-21 19:42:04 +0000
committerChef Expeditor <chef-ci@chef.io>2021-06-21 19:42:04 +0000
commit72358264954b89b73acad1386e32c7b13969a903 (patch)
treeb8d52cc4f748621ec492f3bbd1e517a32701896e
parentfb8094fda51b233f8c88d16a3eab907b2a9bd98f (diff)
downloadchef-72358264954b89b73acad1386e32c7b13969a903.tar.gz
Bump version to 17.3.6 by Chef Expeditorv17.3.6
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--knife/lib/chef/knife/version.rb2
-rw-r--r--lib/chef/version.rb2
8 files changed, 21 insertions, 20 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1f720facc1..2071650f3e 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.3.5 -->
-## [v17.3.5](https://github.com/chef/chef/tree/v17.3.5) (2021-06-21)
+<!-- latest_release 17.3.6 -->
+## [v17.3.6](https://github.com/chef/chef/tree/v17.3.6) (2021-06-21)
#### Merged Pull Requests
-- Revert &quot;Fixed Validation failed while creating databag and databag item&quot; [#11732](https://github.com/chef/chef/pull/11732) ([lamont-granquist](https://github.com/lamont-granquist))
+- Revert addition of x25519 gem to knife [#11733](https://github.com/chef/chef/pull/11733) ([lamont-granquist](https://github.com/lamont-granquist))
<!-- latest_release -->
<!-- release_rollup since=17.2.29 -->
### Changes not yet released to stable
#### Merged Pull Requests
+- Revert addition of x25519 gem to knife [#11733](https://github.com/chef/chef/pull/11733) ([lamont-granquist](https://github.com/lamont-granquist)) <!-- 17.3.6 -->
- Revert &quot;Fixed Validation failed while creating databag and databag item&quot; [#11732](https://github.com/chef/chef/pull/11732) ([lamont-granquist](https://github.com/lamont-granquist)) <!-- 17.3.5 -->
- Update Ohai to 17.2, InSpec to 4.37.20 and add back windows deps [#11727](https://github.com/chef/chef/pull/11727) ([tas50](https://github.com/tas50)) <!-- 17.3.4 -->
- Bump berkshelf from 7.2.1 to 7.2.2 in /omnibus [#11723](https://github.com/chef/chef/pull/11723) ([dependabot-preview[bot]](https://github.com/dependabot-preview[bot])) <!-- 17.3.3 -->
diff --git a/Gemfile.lock b/Gemfile.lock
index 9e852c2e1a..9fe9994525 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -35,10 +35,10 @@ GIT
PATH
remote: .
specs:
- chef (17.3.5)
+ chef (17.3.6)
addressable
- chef-config (= 17.3.5)
- chef-utils (= 17.3.5)
+ chef-config (= 17.3.6)
+ chef-utils (= 17.3.6)
chef-vault
chef-zero (>= 14.0.11)
diff-lcs (>= 1.2.4, < 1.4.0)
@@ -62,10 +62,10 @@ PATH
train-core (~> 3.2, >= 3.2.28)
train-winrm (>= 0.2.5)
uuidtools (>= 2.1.5, < 3.0)
- chef (17.3.5-universal-mingw32)
+ chef (17.3.6-universal-mingw32)
addressable
- chef-config (= 17.3.5)
- chef-utils (= 17.3.5)
+ chef-config (= 17.3.6)
+ chef-utils (= 17.3.6)
chef-vault
chef-zero (>= 14.0.11)
diff-lcs (>= 1.2.4, < 1.4.0)
@@ -104,15 +104,15 @@ PATH
PATH
remote: chef-bin
specs:
- chef-bin (17.3.5)
- chef (= 17.3.5)
+ chef-bin (17.3.6)
+ chef (= 17.3.6)
PATH
remote: chef-config
specs:
- chef-config (17.3.5)
+ chef-config (17.3.6)
addressable
- chef-utils (= 17.3.5)
+ chef-utils (= 17.3.6)
fuzzyurl
mixlib-config (>= 2.2.12, < 4.0)
mixlib-shellout (>= 2.0, < 4.0)
@@ -121,7 +121,7 @@ PATH
PATH
remote: chef-utils
specs:
- chef-utils (17.3.5)
+ chef-utils (17.3.6)
concurrent-ruby
GEM
diff --git a/VERSION b/VERSION
index bf82222cb8..0e3a0520b1 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-17.3.5 \ No newline at end of file
+17.3.6 \ 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 bc301946bb..2a3bd1b81b 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.3.5".freeze
+ VERSION = "17.3.6".freeze
end
#
diff --git a/chef-config/lib/chef-config/version.rb b/chef-config/lib/chef-config/version.rb
index 6b6f6e220b..3f55481118 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.3.5".freeze
+ VERSION = "17.3.6".freeze
end
diff --git a/chef-utils/lib/chef-utils/version.rb b/chef-utils/lib/chef-utils/version.rb
index 2da0c9ee93..07d07da1ab 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.3.5"
+ VERSION = "17.3.6"
end
diff --git a/knife/lib/chef/knife/version.rb b/knife/lib/chef/knife/version.rb
index 0c360a371f..c875096033 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.3.5".freeze
+ VERSION = "17.3.6".freeze
end
end
diff --git a/lib/chef/version.rb b/lib/chef/version.rb
index e324f582ef..bee7ce7ec5 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.3.5")
+ VERSION = Chef::VersionString.new("17.3.6")
end
#