summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChef Expeditor <chef-ci@chef.io>2021-08-23 19:21:40 +0000
committerChef Expeditor <chef-ci@chef.io>2021-08-23 19:21:40 +0000
commit68acd9d44eab0dd3b7674eafebee6a0d934c8298 (patch)
treeb6f6a696966f9e6bbc4065c6b634017f9c914334
parent71b6f71067c25f74018f7aaa183af4108e366a58 (diff)
downloadchef-68acd9d44eab0dd3b7674eafebee6a0d934c8298.tar.gz
Bump version to 17.4.25 by Chef Expeditorv17.4.25
Obvious fix; these changes are the result of automation not creative thinking.
-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 b5c88828cd..9aec75b278 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.4.24 -->
-## [v17.4.24](https://github.com/chef/chef/tree/v17.4.24) (2021-08-23)
+<!-- latest_release 17.4.25 -->
+## [v17.4.25](https://github.com/chef/chef/tree/v17.4.25) (2021-08-23)
#### Merged Pull Requests
-- Update InSpec to 4.41 [#11943](https://github.com/chef/chef/pull/11943) ([tas50](https://github.com/tas50))
+- Remove the default json logger from the compliance API [#11924](https://github.com/chef/chef/pull/11924) ([lamont-granquist](https://github.com/lamont-granquist))
<!-- latest_release -->
<!-- release_rollup since=17.3.48 -->
### Changes not yet released to stable
#### Merged Pull Requests
+- Remove the default json logger from the compliance API [#11924](https://github.com/chef/chef/pull/11924) ([lamont-granquist](https://github.com/lamont-granquist)) <!-- 17.4.25 -->
- Update InSpec to 4.41 [#11943](https://github.com/chef/chef/pull/11943) ([tas50](https://github.com/tas50)) <!-- 17.4.24 -->
- Fix failures in mac_user when not all user fields are present [#11925](https://github.com/chef/chef/pull/11925) ([tas50](https://github.com/tas50)) <!-- 17.4.23 -->
- Revert 11731 [#11935](https://github.com/chef/chef/pull/11935) ([marcparadise](https://github.com/marcparadise)) <!-- 17.4.22 -->
diff --git a/Gemfile.lock b/Gemfile.lock
index 6fea51abcc..181082f6e3 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -35,11 +35,11 @@ GIT
PATH
remote: .
specs:
- chef (17.4.24)
+ chef (17.4.25)
addressable
aws-sdk-secretsmanager (~> 1.46)
- chef-config (= 17.4.24)
- chef-utils (= 17.4.24)
+ chef-config (= 17.4.25)
+ chef-utils (= 17.4.25)
chef-vault
chef-zero (>= 14.0.11)
diff-lcs (>= 1.2.4, < 1.4.0)
@@ -63,11 +63,11 @@ PATH
train-core (~> 3.2, >= 3.2.28)
train-winrm (>= 0.2.5)
uuidtools (>= 2.1.5, < 3.0)
- chef (17.4.24-universal-mingw32)
+ chef (17.4.25-universal-mingw32)
addressable
aws-sdk-secretsmanager (~> 1.46)
- chef-config (= 17.4.24)
- chef-utils (= 17.4.24)
+ chef-config (= 17.4.25)
+ chef-utils (= 17.4.25)
chef-vault
chef-zero (>= 14.0.11)
diff-lcs (>= 1.2.4, < 1.4.0)
@@ -106,15 +106,15 @@ PATH
PATH
remote: chef-bin
specs:
- chef-bin (17.4.24)
- chef (= 17.4.24)
+ chef-bin (17.4.25)
+ chef (= 17.4.25)
PATH
remote: chef-config
specs:
- chef-config (17.4.24)
+ chef-config (17.4.25)
addressable
- chef-utils (= 17.4.24)
+ chef-utils (= 17.4.25)
fuzzyurl
mixlib-config (>= 2.2.12, < 4.0)
mixlib-shellout (>= 2.0, < 4.0)
@@ -123,7 +123,7 @@ PATH
PATH
remote: chef-utils
specs:
- chef-utils (17.4.24)
+ chef-utils (17.4.25)
concurrent-ruby
GEM
@@ -136,7 +136,7 @@ GEM
mixlib-shellout (>= 2.0, < 4.0)
ast (2.4.2)
aws-eventstream (1.1.1)
- aws-partitions (1.489.0)
+ aws-partitions (1.490.0)
aws-sdk-core (3.119.1)
aws-eventstream (~> 1, >= 1.0.2)
aws-partitions (~> 1, >= 1.239.0)
diff --git a/VERSION b/VERSION
index 0f3ee40cc6..42c562bb7d 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-17.4.24 \ No newline at end of file
+17.4.25 \ 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 1ea5c03b34..39ec257da8 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.4.24".freeze
+ VERSION = "17.4.25".freeze
end
#
diff --git a/chef-config/lib/chef-config/version.rb b/chef-config/lib/chef-config/version.rb
index 731c6a0fa3..1bc672e543 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.4.24".freeze
+ VERSION = "17.4.25".freeze
end
diff --git a/chef-utils/lib/chef-utils/version.rb b/chef-utils/lib/chef-utils/version.rb
index 62ebc84ee4..8551e9a3fd 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.4.24"
+ VERSION = "17.4.25"
end
diff --git a/knife/lib/chef/knife/version.rb b/knife/lib/chef/knife/version.rb
index ef8af7486c..014d3afd89 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.4.24".freeze
+ VERSION = "17.4.25".freeze
end
end
diff --git a/lib/chef/version.rb b/lib/chef/version.rb
index 505be01360..519c328902 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.4.24")
+ VERSION = Chef::VersionString.new("17.4.25")
end
#