diff options
author | Chef Expeditor <expeditor@chef.io> | 2020-07-10 21:39:15 +0000 |
---|---|---|
committer | Chef Expeditor <expeditor@chef.io> | 2020-07-10 21:39:15 +0000 |
commit | a36d0aabebfa51e14e6429e40baa9473d832cb3a (patch) | |
tree | 39d60fcb06ef89820d805acd4b47f10bb09f4fde | |
parent | abaece369f90918610039661a716f9915e18853e (diff) | |
download | chef-a36d0aabebfa51e14e6429e40baa9473d832cb3a.tar.gz |
Bump version to 16.2.97 by Chef Expeditorv16.2.97
Obvious fix; these changes are the result of automation not creative thinking.
-rw-r--r-- | CHANGELOG.md | 7 | ||||
-rw-r--r-- | Gemfile.lock | 24 | ||||
-rw-r--r-- | VERSION | 2 | ||||
-rw-r--r-- | chef-bin/lib/chef-bin/version.rb | 2 | ||||
-rw-r--r-- | chef-config/lib/chef-config/version.rb | 2 | ||||
-rw-r--r-- | chef-utils/lib/chef-utils/version.rb | 2 | ||||
-rw-r--r-- | lib/chef/version.rb | 2 |
7 files changed, 21 insertions, 20 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 8345dd53e4..b9a815a925 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.96 --> -## [v16.2.96](https://github.com/chef/chef/tree/v16.2.96) (2020-07-09) +<!-- latest_release 16.2.97 --> +## [v16.2.97](https://github.com/chef/chef/tree/v16.2.97) (2020-07-10) #### Merged Pull Requests -- Fix openssl config tests on Windows [#10138](https://github.com/chef/chef/pull/10138) ([phiggins](https://github.com/phiggins)) +- Fix git sync if the local branch already exist [#9998](https://github.com/chef/chef/pull/9998) ([lotooo](https://github.com/lotooo)) <!-- latest_release --> <!-- release_rollup since=16.2.73 --> ### Changes not yet released to stable #### Merged Pull Requests +- Fix git sync if the local branch already exist [#9998](https://github.com/chef/chef/pull/9998) ([lotooo](https://github.com/lotooo)) <!-- 16.2.97 --> - Fix openssl config tests on Windows [#10138](https://github.com/chef/chef/pull/10138) ([phiggins](https://github.com/phiggins)) <!-- 16.2.96 --> - Disable Naming/AsciiIdentifiers in our specs [#10139](https://github.com/chef/chef/pull/10139) ([tas50](https://github.com/tas50)) <!-- 16.2.95 --> - Support legacy DSS host keys with knife-ssh [#10133](https://github.com/chef/chef/pull/10133) ([tas50](https://github.com/tas50)) <!-- 16.2.94 --> diff --git a/Gemfile.lock b/Gemfile.lock index 24706e31a8..a01a0ac3a1 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -28,12 +28,12 @@ GIT PATH remote: . specs: - chef (16.2.96) + chef (16.2.97) addressable bcrypt_pbkdf (= 1.1.0.rc1) bundler (>= 1.10) - chef-config (= 16.2.96) - chef-utils (= 16.2.96) + chef-config (= 16.2.97) + chef-utils (= 16.2.97) chef-vault chef-zero (>= 14.0.11) diff-lcs (>= 1.2.4, < 1.4.0) @@ -62,12 +62,12 @@ PATH train-winrm (>= 0.2.5) tty-screen (~> 0.6) uuidtools (~> 2.1.5) - chef (16.2.96-universal-mingw32) + chef (16.2.97-universal-mingw32) addressable bcrypt_pbkdf (= 1.1.0.rc1) bundler (>= 1.10) - chef-config (= 16.2.96) - chef-utils (= 16.2.96) + chef-config (= 16.2.97) + chef-utils (= 16.2.97) chef-vault chef-zero (>= 14.0.11) diff-lcs (>= 1.2.4, < 1.4.0) @@ -112,15 +112,15 @@ PATH PATH remote: chef-bin specs: - chef-bin (16.2.96) - chef (= 16.2.96) + chef-bin (16.2.97) + chef (= 16.2.97) PATH remote: chef-config specs: - chef-config (16.2.96) + chef-config (16.2.97) addressable - chef-utils (= 16.2.96) + chef-utils (= 16.2.97) 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.96) + chef-utils (16.2.97) GEM remote: https://rubygems.org/ @@ -257,7 +257,7 @@ GEM mixlib-shellout (3.0.9-universal-mingw32) win32-process (~> 0.8.2) wmi-lite (~> 1.0) - multi_json (1.14.1) + multi_json (1.15.0) multipart-post (2.1.1) necromancer (0.5.1) net-scp (3.0.0) @@ -1 +1 @@ -16.2.96
\ No newline at end of file +16.2.97
\ 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 5ca13c207d..4c67eedf39 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 = "16.2.96".freeze + VERSION = "16.2.97".freeze end # diff --git a/chef-config/lib/chef-config/version.rb b/chef-config/lib/chef-config/version.rb index dcfc6c7073..a4f570b932 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 = "16.2.96".freeze + VERSION = "16.2.97".freeze end diff --git a/chef-utils/lib/chef-utils/version.rb b/chef-utils/lib/chef-utils/version.rb index 7470d9069e..9ea5089619 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("..", __dir__) - VERSION = "16.2.96".freeze + VERSION = "16.2.97".freeze end diff --git a/lib/chef/version.rb b/lib/chef/version.rb index 9bae256480..3eaf1723a2 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("16.2.96") + VERSION = Chef::VersionString.new("16.2.97") end # |