summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChef Expeditor <chef-ci@chef.io>2020-12-22 04:57:53 +0000
committerChef Expeditor <chef-ci@chef.io>2020-12-22 04:57:53 +0000
commit57655244be360f3e9620210633035efe5c049161 (patch)
tree33474ea495736dd35d201f20fef1a1fc2d7df994
parent6b35840717cefdf1311fd12465f78344749303b1 (diff)
downloadchef-57655244be360f3e9620210633035efe5c049161.tar.gz
Bump version to 17.0.4 by Chef Expeditorv17.0.4
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--lib/chef/version.rb2
7 files changed, 20 insertions, 19 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 92da04a717..80e220a0d3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,15 +1,16 @@
<!-- usage documentation: http://expeditor-docs.es.chef.io/configuration/changelog/ -->
-<!-- latest_release 17.0.3 -->
-## [v17.0.3](https://github.com/chef/chef/tree/v17.0.3) (2020-12-20)
+<!-- latest_release 17.0.4 -->
+## [v17.0.4](https://github.com/chef/chef/tree/v17.0.4) (2020-12-22)
#### Merged Pull Requests
-- Fixed cron_d resource ignoring sensitive property in Chef 17 [#10767](https://github.com/chef/chef/pull/10767) ([axl89](https://github.com/axl89))
+- Pull in the new FFI we need for M1 Macs [#10772](https://github.com/chef/chef/pull/10772) ([tas50](https://github.com/tas50))
<!-- latest_release -->
<!-- release_rollup since=16.8.14 -->
### Changes not yet released to stable
#### Merged Pull Requests
+- Pull in the new FFI we need for M1 Macs [#10772](https://github.com/chef/chef/pull/10772) ([tas50](https://github.com/tas50)) <!-- 17.0.4 -->
- Fixed cron_d resource ignoring sensitive property in Chef 17 [#10767](https://github.com/chef/chef/pull/10767) ([axl89](https://github.com/axl89)) <!-- 17.0.3 -->
- Remove EOL RHEL 6 32bit builds [#10721](https://github.com/chef/chef/pull/10721) ([tas50](https://github.com/tas50)) <!-- 17.0.2 -->
- Chef 17: Assume Rubygems 1.8 in the rubygems provider / specs [#10379](https://github.com/chef/chef/pull/10379) ([tas50](https://github.com/tas50)) <!-- 17.0.1 -->
diff --git a/Gemfile.lock b/Gemfile.lock
index a75c1f6ad9..56dbbc26d9 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -28,12 +28,12 @@ GIT
PATH
remote: .
specs:
- chef (17.0.3)
+ chef (17.0.4)
addressable
bcrypt_pbkdf (= 1.1.0.rc1)
bundler (>= 1.10)
- chef-config (= 17.0.3)
- chef-utils (= 17.0.3)
+ chef-config (= 17.0.4)
+ chef-utils (= 17.0.4)
chef-vault
chef-zero (>= 14.0.11)
diff-lcs (>= 1.2.4, < 1.4.0)
@@ -65,12 +65,12 @@ PATH
tty-screen (~> 0.6)
tty-table (~> 0.11)
uuidtools (~> 2.1.5)
- chef (17.0.3-universal-mingw32)
+ chef (17.0.4-universal-mingw32)
addressable
bcrypt_pbkdf (= 1.1.0.rc1)
bundler (>= 1.10)
- chef-config (= 17.0.3)
- chef-utils (= 17.0.3)
+ chef-config (= 17.0.4)
+ chef-utils (= 17.0.4)
chef-vault
chef-zero (>= 14.0.11)
diff-lcs (>= 1.2.4, < 1.4.0)
@@ -117,15 +117,15 @@ PATH
PATH
remote: chef-bin
specs:
- chef-bin (17.0.3)
- chef (= 17.0.3)
+ chef-bin (17.0.4)
+ chef (= 17.0.4)
PATH
remote: chef-config
specs:
- chef-config (17.0.3)
+ chef-config (17.0.4)
addressable
- chef-utils (= 17.0.3)
+ chef-utils (= 17.0.4)
fuzzyurl
mixlib-config (>= 2.2.12, < 4.0)
mixlib-shellout (>= 2.0, < 4.0)
@@ -134,7 +134,7 @@ PATH
PATH
remote: chef-utils
specs:
- chef-utils (17.0.3)
+ chef-utils (17.0.4)
GEM
remote: https://rubygems.org/
diff --git a/VERSION b/VERSION
index 8daea6f5aa..edd0fe94f9 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-17.0.3 \ No newline at end of file
+17.0.4 \ 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 c22218d23f..b8e5910285 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.0.3".freeze
+ VERSION = "17.0.4".freeze
end
#
diff --git a/chef-config/lib/chef-config/version.rb b/chef-config/lib/chef-config/version.rb
index 5125c58757..bb0be1be04 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.0.3".freeze
+ VERSION = "17.0.4".freeze
end
diff --git a/chef-utils/lib/chef-utils/version.rb b/chef-utils/lib/chef-utils/version.rb
index 2acecdaa0f..1f98ec9b30 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.0.3"
+ VERSION = "17.0.4"
end
diff --git a/lib/chef/version.rb b/lib/chef/version.rb
index c0780fec80..5b5a6bfce3 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.0.3")
+ VERSION = Chef::VersionString.new("17.0.4")
end
#