diff options
author | Chef Expeditor <chef-ci@chef.io> | 2020-09-04 21:01:01 +0000 |
---|---|---|
committer | Chef Expeditor <chef-ci@chef.io> | 2020-09-04 21:01:01 +0000 |
commit | c18707c0cdb6a92844139ea6642abcc55a9f2b37 (patch) | |
tree | 544303f7f02436dabe966f9e5d06afac44f553b5 | |
parent | f96de160e24357a86d766ba0e0f88cbcd48106dc (diff) | |
download | chef-c18707c0cdb6a92844139ea6642abcc55a9f2b37.tar.gz |
Bump version to 16.5.30 by Chef Expeditorv16.5.30
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 697552922d..3057ef525b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,15 +1,16 @@ <!-- usage documentation: http://expeditor-docs.es.chef.io/configuration/changelog/ --> -<!-- latest_release 16.5.29 --> -## [v16.5.29](https://github.com/chef/chef/tree/v16.5.29) (2020-09-04) +<!-- latest_release 16.5.30 --> +## [v16.5.30](https://github.com/chef/chef/tree/v16.5.30) (2020-09-04) #### Merged Pull Requests -- Allow removing profiles in osx_profile on Big Sur [#10386](https://github.com/chef/chef/pull/10386) ([tas50](https://github.com/tas50)) +- Fix nil deep_merging [#10382](https://github.com/chef/chef/pull/10382) ([lamont-granquist](https://github.com/lamont-granquist)) <!-- latest_release --> <!-- release_rollup since=16.4.41 --> ### Changes not yet released to stable #### Merged Pull Requests +- Fix nil deep_merging [#10382](https://github.com/chef/chef/pull/10382) ([lamont-granquist](https://github.com/lamont-granquist)) <!-- 16.5.30 --> - Allow removing profiles in osx_profile on Big Sur [#10386](https://github.com/chef/chef/pull/10386) ([tas50](https://github.com/tas50)) <!-- 16.5.29 --> - Update all deps to current [#10385](https://github.com/chef/chef/pull/10385) ([tas50](https://github.com/tas50)) <!-- 16.5.28 --> - chef_client_systemd_timer: Add the ability to set CPUQuota on the chef-client unit [#10381](https://github.com/chef/chef/pull/10381) ([tas50](https://github.com/tas50)) <!-- 16.5.27 --> diff --git a/Gemfile.lock b/Gemfile.lock index e10c6d666a..041175170e 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -27,12 +27,12 @@ GIT PATH remote: . specs: - chef (16.5.29) + chef (16.5.30) addressable bcrypt_pbkdf (= 1.1.0.rc1) bundler (>= 1.10) - chef-config (= 16.5.29) - chef-utils (= 16.5.29) + chef-config (= 16.5.30) + chef-utils (= 16.5.30) chef-vault chef-zero (>= 14.0.11) diff-lcs (>= 1.2.4, < 1.4.0) @@ -63,12 +63,12 @@ PATH tty-screen (~> 0.6) tty-table (~> 0.11.0) uuidtools (~> 2.1.5) - chef (16.5.29-universal-mingw32) + chef (16.5.30-universal-mingw32) addressable bcrypt_pbkdf (= 1.1.0.rc1) bundler (>= 1.10) - chef-config (= 16.5.29) - chef-utils (= 16.5.29) + chef-config (= 16.5.30) + chef-utils (= 16.5.30) 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.5.29) - chef (= 16.5.29) + chef-bin (16.5.30) + chef (= 16.5.30) PATH remote: chef-config specs: - chef-config (16.5.29) + chef-config (16.5.30) addressable - chef-utils (= 16.5.29) + chef-utils (= 16.5.30) 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.5.29) + chef-utils (16.5.30) GEM remote: https://rubygems.org/ @@ -1 +1 @@ -16.5.29
\ No newline at end of file +16.5.30
\ 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 b0fbfc6054..c89f32f1ab 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.5.29".freeze + VERSION = "16.5.30".freeze end # diff --git a/chef-config/lib/chef-config/version.rb b/chef-config/lib/chef-config/version.rb index 3ee75c3abe..68cd103766 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.5.29".freeze + VERSION = "16.5.30".freeze end diff --git a/chef-utils/lib/chef-utils/version.rb b/chef-utils/lib/chef-utils/version.rb index 74cd501428..ab1241b555 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.5.29".freeze + VERSION = "16.5.30".freeze end diff --git a/lib/chef/version.rb b/lib/chef/version.rb index 8291b65c21..ce1ad3a5bf 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.5.29") + VERSION = Chef::VersionString.new("16.5.30") end # |