summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChef Expeditor <chef-ci@chef.io>2021-01-01 00:49:40 +0000
committerChef Expeditor <chef-ci@chef.io>2021-01-01 00:49:40 +0000
commit4a3ca288bb7e580f039b7d78a86ec195f8086872 (patch)
tree1e47dfea997147accea22e725e599404aab1f28c
parent93893e896dde4430b5c0065673c78c9011dbda02 (diff)
downloadchef-4a3ca288bb7e580f039b7d78a86ec195f8086872.tar.gz
Bump version to 17.0.25 by Chef Expeditorv17.0.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--lib/chef/version.rb2
7 files changed, 22 insertions, 19 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6fe05a450a..e85a0163ed 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.0.24 -->
-## [v17.0.24](https://github.com/chef/chef/tree/v17.0.24) (2020-12-31)
+<!-- latest_release 17.0.25 -->
+## [v17.0.25](https://github.com/chef/chef/tree/v17.0.25) (2021-01-01)
#### Merged Pull Requests
-- Add gemspec metadata [#10809](https://github.com/chef/chef/pull/10809) ([tas50](https://github.com/tas50))
+- Pin ffi for now to prevent i386 windows failures [#10810](https://github.com/chef/chef/pull/10810) ([tas50](https://github.com/tas50))
<!-- latest_release -->
<!-- release_rollup since=16.8.14 -->
### Changes not yet released to stable
#### Merged Pull Requests
+- Pin ffi for now to prevent i386 windows failures [#10810](https://github.com/chef/chef/pull/10810) ([tas50](https://github.com/tas50)) <!-- 17.0.25 -->
- Add gemspec metadata [#10809](https://github.com/chef/chef/pull/10809) ([tas50](https://github.com/tas50)) <!-- 17.0.24 -->
- Bump omnibus from `d13ae16` to `44f1303` in /omnibus [#10806](https://github.com/chef/chef/pull/10806) ([dependabot-preview[bot]](https://github.com/dependabot-preview[bot])) <!-- 17.0.23 -->
- Bump omnibus-software from `457df26` to `869ef4e` in /omnibus [#10808](https://github.com/chef/chef/pull/10808) ([dependabot-preview[bot]](https://github.com/dependabot-preview[bot])) <!-- 17.0.22 -->
diff --git a/Gemfile.lock b/Gemfile.lock
index 5708130a84..89d6dea6ae 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -28,11 +28,11 @@ GIT
PATH
remote: .
specs:
- chef (17.0.24)
+ chef (17.0.25)
addressable
bcrypt_pbkdf (= 1.1.0.rc2)
- chef-config (= 17.0.24)
- chef-utils (= 17.0.24)
+ chef-config (= 17.0.25)
+ chef-utils (= 17.0.25)
chef-vault
chef-zero (>= 14.0.11)
diff-lcs (>= 1.2.4, < 1.4.0)
@@ -64,11 +64,11 @@ PATH
tty-screen (~> 0.6)
tty-table (~> 0.11)
uuidtools (~> 2.1.5)
- chef (17.0.24-universal-mingw32)
+ chef (17.0.25-universal-mingw32)
addressable
bcrypt_pbkdf (= 1.1.0.rc2)
- chef-config (= 17.0.24)
- chef-utils (= 17.0.24)
+ chef-config (= 17.0.25)
+ chef-utils (= 17.0.25)
chef-vault
chef-zero (>= 14.0.11)
diff-lcs (>= 1.2.4, < 1.4.0)
@@ -115,15 +115,15 @@ PATH
PATH
remote: chef-bin
specs:
- chef-bin (17.0.24)
- chef (= 17.0.24)
+ chef-bin (17.0.25)
+ chef (= 17.0.25)
PATH
remote: chef-config
specs:
- chef-config (17.0.24)
+ chef-config (17.0.25)
addressable
- chef-utils (= 17.0.24)
+ chef-utils (= 17.0.25)
fuzzyurl
mixlib-config (>= 2.2.12, < 4.0)
mixlib-shellout (>= 2.0, < 4.0)
@@ -132,7 +132,7 @@ PATH
PATH
remote: chef-utils
specs:
- chef-utils (17.0.24)
+ chef-utils (17.0.25)
GEM
remote: https://rubygems.org/
@@ -177,6 +177,8 @@ GEM
fauxhai-ng (8.6.0)
net-ssh
ffi (1.13.1)
+ ffi (1.13.1-x64-mingw32)
+ ffi (1.13.1-x86-mingw32)
ffi-libarchive (1.0.4)
ffi (~> 1.0)
ffi-win32-extensions (1.0.4)
diff --git a/VERSION b/VERSION
index 0269c93878..12d2fb91a0 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-17.0.24 \ No newline at end of file
+17.0.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 fad2b68544..d728b7943a 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.24".freeze
+ VERSION = "17.0.25".freeze
end
#
diff --git a/chef-config/lib/chef-config/version.rb b/chef-config/lib/chef-config/version.rb
index 74f425d30a..e40e6010a7 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.24".freeze
+ VERSION = "17.0.25".freeze
end
diff --git a/chef-utils/lib/chef-utils/version.rb b/chef-utils/lib/chef-utils/version.rb
index 060635f4e3..1c59bd8331 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.24"
+ VERSION = "17.0.25"
end
diff --git a/lib/chef/version.rb b/lib/chef/version.rb
index a89aef5e12..b44182c098 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.24")
+ VERSION = Chef::VersionString.new("17.0.25")
end
#