summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChef Expeditor <chef-ci@chef.io>2020-08-07 22:52:31 +0000
committerChef Expeditor <chef-ci@chef.io>2020-08-07 22:52:31 +0000
commit0e0a6152444a2218ae1202ccfa61bd8edcd2f83f (patch)
tree89cbd2169d46a90ff70bdcea54afebf6693c96bc
parentbcb8c915242694137a8691eea97abc5d6582fea5 (diff)
downloadchef-16.4.16.tar.gz
Bump version to 16.4.16 by Chef Expeditorv16.4.16
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 a354e3f26a..d05ad506c7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,15 +1,16 @@
<!-- usage documentation: http://expeditor-docs.es.chef.io/configuration/changelog/ -->
-<!-- latest_release 16.4.15 -->
-## [v16.4.15](https://github.com/chef/chef/tree/v16.4.15) (2020-08-07)
+<!-- latest_release 16.4.16 -->
+## [v16.4.16](https://github.com/chef/chef/tree/v16.4.16) (2020-08-07)
#### Merged Pull Requests
-- powershell_script: Use native properties and don&#39;t coerce user provided flags with powershell defaults [#10274](https://github.com/chef/chef/pull/10274) ([phiggins](https://github.com/phiggins))
+- Mark deep_merge as private [#10277](https://github.com/chef/chef/pull/10277) ([lamont-granquist](https://github.com/lamont-granquist))
<!-- latest_release -->
<!-- release_rollup since=16.3.45 -->
### Changes not yet released to stable
#### Merged Pull Requests
+- Mark deep_merge as private [#10277](https://github.com/chef/chef/pull/10277) ([lamont-granquist](https://github.com/lamont-granquist)) <!-- 16.4.16 -->
- powershell_script: Use native properties and don&#39;t coerce user provided flags with powershell defaults [#10274](https://github.com/chef/chef/pull/10274) ([phiggins](https://github.com/phiggins)) <!-- 16.4.15 -->
- chef_client_systemd_timer: Fix failures in the :remove action [#10273](https://github.com/chef/chef/pull/10273) ([tas50](https://github.com/tas50)) <!-- 16.4.14 -->
- Resolve Style/RedundantAssignment warnings [#10269](https://github.com/chef/chef/pull/10269) ([tas50](https://github.com/tas50)) <!-- 16.4.13 -->
diff --git a/Gemfile.lock b/Gemfile.lock
index 88757e736c..a4f3214284 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -28,12 +28,12 @@ GIT
PATH
remote: .
specs:
- chef (16.4.15)
+ chef (16.4.16)
addressable
bcrypt_pbkdf (= 1.1.0.rc1)
bundler (>= 1.10)
- chef-config (= 16.4.15)
- chef-utils (= 16.4.15)
+ chef-config (= 16.4.16)
+ chef-utils (= 16.4.16)
chef-vault
chef-zero (>= 14.0.11)
diff-lcs (>= 1.2.4, < 1.4.0)
@@ -63,12 +63,12 @@ PATH
tty-prompt (~> 0.21)
tty-screen (~> 0.6)
uuidtools (~> 2.1.5)
- chef (16.4.15-universal-mingw32)
+ chef (16.4.16-universal-mingw32)
addressable
bcrypt_pbkdf (= 1.1.0.rc1)
bundler (>= 1.10)
- chef-config (= 16.4.15)
- chef-utils (= 16.4.15)
+ chef-config (= 16.4.16)
+ chef-utils (= 16.4.16)
chef-vault
chef-zero (>= 14.0.11)
diff-lcs (>= 1.2.4, < 1.4.0)
@@ -114,15 +114,15 @@ PATH
PATH
remote: chef-bin
specs:
- chef-bin (16.4.15)
- chef (= 16.4.15)
+ chef-bin (16.4.16)
+ chef (= 16.4.16)
PATH
remote: chef-config
specs:
- chef-config (16.4.15)
+ chef-config (16.4.16)
addressable
- chef-utils (= 16.4.15)
+ chef-utils (= 16.4.16)
fuzzyurl
mixlib-config (>= 2.2.12, < 4.0)
mixlib-shellout (>= 2.0, < 4.0)
@@ -131,7 +131,7 @@ PATH
PATH
remote: chef-utils
specs:
- chef-utils (16.4.15)
+ chef-utils (16.4.16)
GEM
remote: https://rubygems.org/
diff --git a/VERSION b/VERSION
index 44b72baa19..9136e76dc2 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-16.4.15 \ No newline at end of file
+16.4.16 \ 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 d84e533726..ab62fe28f7 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.4.15".freeze
+ VERSION = "16.4.16".freeze
end
#
diff --git a/chef-config/lib/chef-config/version.rb b/chef-config/lib/chef-config/version.rb
index 9a84c65fbd..b3895b4cab 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.4.15".freeze
+ VERSION = "16.4.16".freeze
end
diff --git a/chef-utils/lib/chef-utils/version.rb b/chef-utils/lib/chef-utils/version.rb
index 98a7d1e929..7e16ba750b 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.4.15".freeze
+ VERSION = "16.4.16".freeze
end
diff --git a/lib/chef/version.rb b/lib/chef/version.rb
index f57d84a134..64b1dce8a5 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.4.15")
+ VERSION = Chef::VersionString.new("16.4.16")
end
#