summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChef Expeditor <expeditor@chef.io>2020-07-06 23:33:09 +0000
committerChef Expeditor <expeditor@chef.io>2020-07-06 23:33:09 +0000
commit3e9e6d41a31bd1ac932f7f4100102466b4fdfe05 (patch)
tree469ddecd5283378604278c6bf8b549f7b7d3a551
parent293e9ebf31ec6912aaf78d5563a417d859aa78dd (diff)
downloadchef-3e9e6d41a31bd1ac932f7f4100102466b4fdfe05.tar.gz
Bump version to 16.2.83 by Chef Expeditorv16.2.83
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 bcaf206f15..8951d5d111 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.82 -->
-## [v16.2.82](https://github.com/chef/chef/tree/v16.2.82) (2020-07-06)
+<!-- latest_release 16.2.83 -->
+## [v16.2.83](https://github.com/chef/chef/tree/v16.2.83) (2020-07-06)
#### Merged Pull Requests
-- Switch back to a supported nokogiri release [#10114](https://github.com/chef/chef/pull/10114) ([tas50](https://github.com/tas50))
+- Fix warning message for cb / core resource conflict [#10117](https://github.com/chef/chef/pull/10117) ([tas50](https://github.com/tas50))
<!-- latest_release -->
<!-- release_rollup since=16.2.73 -->
### Changes not yet released to stable
#### Merged Pull Requests
+- 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 -->
- Implement ENFORCE_LICENSE dist constant for knife bootstrap [#9992](https://github.com/chef/chef/pull/9992) ([ramereth](https://github.com/ramereth)) <!-- 16.2.81 -->
- update to powershell_out to be compatible with 32 bit windows [#10107](https://github.com/chef/chef/pull/10107) ([chef-davin](https://github.com/chef-davin)) <!-- 16.2.80 -->
diff --git a/Gemfile.lock b/Gemfile.lock
index a94a6a727c..9b3c73d994 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -28,12 +28,12 @@ GIT
PATH
remote: .
specs:
- chef (16.2.82)
+ chef (16.2.83)
addressable
bcrypt_pbkdf (= 1.1.0.rc1)
bundler (>= 1.10)
- chef-config (= 16.2.82)
- chef-utils (= 16.2.82)
+ chef-config (= 16.2.83)
+ chef-utils (= 16.2.83)
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.82-universal-mingw32)
+ chef (16.2.83-universal-mingw32)
addressable
bcrypt_pbkdf (= 1.1.0.rc1)
bundler (>= 1.10)
- chef-config (= 16.2.82)
- chef-utils (= 16.2.82)
+ chef-config (= 16.2.83)
+ chef-utils (= 16.2.83)
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.82)
- chef (= 16.2.82)
+ chef-bin (16.2.83)
+ chef (= 16.2.83)
PATH
remote: chef-config
specs:
- chef-config (16.2.82)
+ chef-config (16.2.83)
addressable
- chef-utils (= 16.2.82)
+ chef-utils (= 16.2.83)
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.82)
+ chef-utils (16.2.83)
GEM
remote: https://rubygems.org/
diff --git a/VERSION b/VERSION
index 01baa811e1..00d5c588e3 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-16.2.82 \ No newline at end of file
+16.2.83 \ 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 341f34b338..e057446eb3 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.82".freeze
+ VERSION = "16.2.83".freeze
end
#
diff --git a/chef-config/lib/chef-config/version.rb b/chef-config/lib/chef-config/version.rb
index efb688b536..5b46a89604 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.82".freeze
+ VERSION = "16.2.83".freeze
end
diff --git a/chef-utils/lib/chef-utils/version.rb b/chef-utils/lib/chef-utils/version.rb
index 60bd763afe..fa101fa82e 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.82".freeze
+ VERSION = "16.2.83".freeze
end
diff --git a/lib/chef/version.rb b/lib/chef/version.rb
index fe6e0f5353..9971d88a15 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.82")
+ VERSION = Chef::VersionString.new("16.2.83")
end
#