diff options
author | Chef Expeditor <expeditor@chef.io> | 2020-07-07 22:55:04 +0000 |
---|---|---|
committer | Chef Expeditor <expeditor@chef.io> | 2020-07-07 22:55:04 +0000 |
commit | 8dfb972e9dd8c760b453d76b5db73f1f8b96ecb0 (patch) | |
tree | 9186b4430493933a1e24dcb0d6518d27d167f027 | |
parent | 854b64ed4c9b14c84aa62e63e7e6d22aad1ffeaf (diff) | |
download | chef-8dfb972e9dd8c760b453d76b5db73f1f8b96ecb0.tar.gz |
Bump version to 16.2.85 by Chef Expeditorv16.2.85
Obvious fix; these changes are the result of automation not creative thinking.
-rw-r--r-- | CHANGELOG.md | 7 | ||||
-rw-r--r-- | Gemfile.lock | 22 | ||||
-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, 20 insertions, 19 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 826bbecfcb..5287f390dd 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.84 --> -## [v16.2.84](https://github.com/chef/chef/tree/v16.2.84) (2020-07-07) +<!-- latest_release 16.2.85 --> +## [v16.2.85](https://github.com/chef/chef/tree/v16.2.85) (2020-07-07) #### Merged Pull Requests -- Add spaces after attrs [#10124](https://github.com/chef/chef/pull/10124) ([tas50](https://github.com/tas50)) +- Avoid assigning variables before returning if we don't have to [#10123](https://github.com/chef/chef/pull/10123) ([tas50](https://github.com/tas50)) <!-- latest_release --> <!-- release_rollup since=16.2.73 --> ### Changes not yet released to stable #### Merged Pull Requests +- Avoid assigning variables before returning if we don't have to [#10123](https://github.com/chef/chef/pull/10123) ([tas50](https://github.com/tas50)) <!-- 16.2.85 --> - Add spaces after attrs [#10124](https://github.com/chef/chef/pull/10124) ([tas50](https://github.com/tas50)) <!-- 16.2.84 --> - Fix warning message for cb / core resource conflict [#10117](https://github.com/chef/chef/pull/10117) ([tas50](https://github.com/tas50)) <!-- 16.2.83 --> - Switch back to a supported nokogiri release [#10114](https://github.com/chef/chef/pull/10114) ([tas50](https://github.com/tas50)) <!-- 16.2.82 --> diff --git a/Gemfile.lock b/Gemfile.lock index 1cdba25c29..2aa8a3d520 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -28,12 +28,12 @@ GIT PATH remote: . specs: - chef (16.2.84) + chef (16.2.85) addressable bcrypt_pbkdf (= 1.1.0.rc1) bundler (>= 1.10) - chef-config (= 16.2.84) - chef-utils (= 16.2.84) + chef-config (= 16.2.85) + chef-utils (= 16.2.85) 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.84-universal-mingw32) + chef (16.2.85-universal-mingw32) addressable bcrypt_pbkdf (= 1.1.0.rc1) bundler (>= 1.10) - chef-config (= 16.2.84) - chef-utils (= 16.2.84) + chef-config (= 16.2.85) + chef-utils (= 16.2.85) 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.84) - chef (= 16.2.84) + chef-bin (16.2.85) + chef (= 16.2.85) PATH remote: chef-config specs: - chef-config (16.2.84) + chef-config (16.2.85) addressable - chef-utils (= 16.2.84) + chef-utils (= 16.2.85) 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.84) + chef-utils (16.2.85) GEM remote: https://rubygems.org/ @@ -1 +1 @@ -16.2.84
\ No newline at end of file +16.2.85
\ 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 d048415aaf..87937e45bb 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.84".freeze + VERSION = "16.2.85".freeze end # diff --git a/chef-config/lib/chef-config/version.rb b/chef-config/lib/chef-config/version.rb index f9fbe85eff..b32e78de88 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.84".freeze + VERSION = "16.2.85".freeze end diff --git a/chef-utils/lib/chef-utils/version.rb b/chef-utils/lib/chef-utils/version.rb index 879412b5af..1c6a3eb88b 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.84".freeze + VERSION = "16.2.85".freeze end diff --git a/lib/chef/version.rb b/lib/chef/version.rb index d96a2aad8c..8e84f5c4b4 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.84") + VERSION = Chef::VersionString.new("16.2.85") end # |