summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChef Expeditor <expeditor@chef.io>2020-06-10 17:49:57 +0000
committerChef Expeditor <expeditor@chef.io>2020-06-10 17:49:57 +0000
commit1e6f64c5398ee5efddd25a1f88ec0c1e322cf59d (patch)
treea7b2debf5f081e75dd82a46a30ef3fc0f19bf7cb
parentbfa1e6e4eb6ef507f306df3a134a0ee233edc4d3 (diff)
downloadchef-1e6f64c5398ee5efddd25a1f88ec0c1e322cf59d.tar.gz
Bump version to 16.2.26 by Chef Expeditorv16.2.26
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 66dbfbb8b3..2cefe7e5f0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,15 +1,16 @@
<!-- usage documentation: http://expeditor-docs.es.chef.io/configuration/changelog/ -->
-<!-- latest_release 16.2.25 -->
-## [v16.2.25](https://github.com/chef/chef/tree/v16.2.25) (2020-06-10)
+<!-- latest_release 16.2.26 -->
+## [v16.2.26](https://github.com/chef/chef/tree/v16.2.26) (2020-06-10)
#### Merged Pull Requests
-- Warn during bootstrapping when using validation keys [#9974](https://github.com/chef/chef/pull/9974) ([tas50](https://github.com/tas50))
+- Allow for the latest net-ssh and ffi 1.13.1 [#9978](https://github.com/chef/chef/pull/9978) ([tas50](https://github.com/tas50))
<!-- latest_release -->
<!-- release_rollup since=16.1.16 -->
### Changes not yet released to stable
#### Merged Pull Requests
+- Allow for the latest net-ssh and ffi 1.13.1 [#9978](https://github.com/chef/chef/pull/9978) ([tas50](https://github.com/tas50)) <!-- 16.2.26 -->
- Warn during bootstrapping when using validation keys [#9974](https://github.com/chef/chef/pull/9974) ([tas50](https://github.com/tas50)) <!-- 16.2.25 -->
- Let the user know what protocol we&#39;re using in knife bootstrap [#9973](https://github.com/chef/chef/pull/9973) ([tas50](https://github.com/tas50)) <!-- 16.2.24 -->
- Add Windows 8 Tester [#9971](https://github.com/chef/chef/pull/9971) ([christopher-snapp](https://github.com/christopher-snapp)) <!-- 16.2.23 -->
diff --git a/Gemfile.lock b/Gemfile.lock
index 7e12beb1e1..a407e4980f 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -28,12 +28,12 @@ GIT
PATH
remote: .
specs:
- chef (16.2.25)
+ chef (16.2.26)
addressable
bcrypt_pbkdf (= 1.1.0.rc1)
bundler (>= 1.10)
- chef-config (= 16.2.25)
- chef-utils (= 16.2.25)
+ chef-config (= 16.2.26)
+ chef-utils (= 16.2.26)
chef-vault
chef-zero (>= 14.0.11)
diff-lcs (~> 1.2, >= 1.2.4)
@@ -62,12 +62,12 @@ PATH
train-winrm (>= 0.2.5)
tty-screen (~> 0.6)
uuidtools (~> 2.1.5)
- chef (16.2.25-universal-mingw32)
+ chef (16.2.26-universal-mingw32)
addressable
bcrypt_pbkdf (= 1.1.0.rc1)
bundler (>= 1.10)
- chef-config (= 16.2.25)
- chef-utils (= 16.2.25)
+ chef-config (= 16.2.26)
+ chef-utils (= 16.2.26)
chef-vault
chef-zero (>= 14.0.11)
diff-lcs (~> 1.2, >= 1.2.4)
@@ -112,15 +112,15 @@ PATH
PATH
remote: chef-bin
specs:
- chef-bin (16.2.25)
- chef (= 16.2.25)
+ chef-bin (16.2.26)
+ chef (= 16.2.26)
PATH
remote: chef-config
specs:
- chef-config (16.2.25)
+ chef-config (16.2.26)
addressable
- chef-utils (= 16.2.25)
+ chef-utils (= 16.2.26)
fuzzyurl
mixlib-config (>= 2.2.12, < 4.0)
mixlib-shellout (>= 2.0, < 4.0)
@@ -129,7 +129,7 @@ PATH
PATH
remote: chef-utils
specs:
- chef-utils (16.2.25)
+ chef-utils (16.2.26)
GEM
remote: https://rubygems.org/
diff --git a/VERSION b/VERSION
index 0eddf914e5..52a8279841 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-16.2.25 \ No newline at end of file
+16.2.26 \ 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 ea1ddb4a8d..f14b6e5430 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("../..", __FILE__)
- VERSION = "16.2.25".freeze
+ VERSION = "16.2.26".freeze
end
#
diff --git a/chef-config/lib/chef-config/version.rb b/chef-config/lib/chef-config/version.rb
index f920dc92a6..f49406f08e 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("../..", __FILE__)
- VERSION = "16.2.25".freeze
+ VERSION = "16.2.26".freeze
end
diff --git a/chef-utils/lib/chef-utils/version.rb b/chef-utils/lib/chef-utils/version.rb
index bd8547a052..7b9c64f4c7 100644
--- a/chef-utils/lib/chef-utils/version.rb
+++ b/chef-utils/lib/chef-utils/version.rb
@@ -15,5 +15,5 @@
module ChefUtils
CHEFUTILS_ROOT = File.expand_path("../..", __FILE__)
- VERSION = "16.2.25".freeze
+ VERSION = "16.2.26".freeze
end
diff --git a/lib/chef/version.rb b/lib/chef/version.rb
index 3c32f9016b..f8c96240fc 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("../..", __FILE__)
- VERSION = Chef::VersionString.new("16.2.25")
+ VERSION = Chef::VersionString.new("16.2.26")
end
#