diff options
author | Chef Expeditor <chef-ci@chef.io> | 2018-11-09 23:24:02 +0000 |
---|---|---|
committer | Chef Expeditor <chef-ci@chef.io> | 2018-11-09 23:24:02 +0000 |
commit | b161757e090d7b4e09bf240b8c89efd51a083d00 (patch) | |
tree | 9ce263c4d8a483c8c5c9ac8ab2173aa801b7a2a2 | |
parent | a5451d119b23e16975e099369e9e44b3658a1e61 (diff) | |
download | chef-b161757e090d7b4e09bf240b8c89efd51a083d00.tar.gz |
Bump version to 15.0.58 by Chef Expeditorv15.0.58
Obvious fix; these changes are the result of automation not creative thinking.
-rw-r--r-- | CHANGELOG.md | 7 | ||||
-rw-r--r-- | Gemfile.lock | 10 | ||||
-rw-r--r-- | VERSION | 2 | ||||
-rw-r--r-- | chef-config/lib/chef-config/version.rb | 2 | ||||
-rw-r--r-- | lib/chef/version.rb | 2 |
5 files changed, 12 insertions, 11 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index febec908eb..ea3a3a974f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,15 +1,16 @@ <!-- usage documentation: http://expeditor-docs.es.chef.io/configuration/changelog/ --> -<!-- latest_release 15.0.56 --> -## [v15.0.56](https://github.com/chef/chef/tree/v15.0.56) (2018-11-09) +<!-- latest_release 15.0.58 --> +## [v15.0.58](https://github.com/chef/chef/tree/v15.0.58) (2018-11-09) #### Merged Pull Requests -- Make sure we define windows_task resource on *nix systems [#7903](https://github.com/chef/chef/pull/7903) ([tas50](https://github.com/tas50)) +- Add nillability to attribute deep merging [#7892](https://github.com/chef/chef/pull/7892) ([lamont-granquist](https://github.com/lamont-granquist)) <!-- latest_release --> <!-- release_rollup --> ### Changes since latest stable release #### Merged Pull Requests +- Add nillability to attribute deep merging [#7892](https://github.com/chef/chef/pull/7892) ([lamont-granquist](https://github.com/lamont-granquist)) <!-- 15.0.58 --> - Make sure we define windows_task resource on *nix systems [#7903](https://github.com/chef/chef/pull/7903) ([tas50](https://github.com/tas50)) <!-- 15.0.56 --> - windows_ad_join: Switch to UPN format usernames for use with AD cmdlets [#7895](https://github.com/chef/chef/pull/7895) ([stuartpreston](https://github.com/stuartpreston)) <!-- 15.0.55 --> - Fix the knife integration spec timeouts [#7896](https://github.com/chef/chef/pull/7896) ([lamont-granquist](https://github.com/lamont-granquist)) <!-- 15.0.54 --> diff --git a/Gemfile.lock b/Gemfile.lock index aa00850375..7e1c62226c 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -27,10 +27,10 @@ GIT PATH remote: . specs: - chef (15.0.57) + chef (15.0.58) addressable bundler (>= 1.10) - chef-config (= 15.0.57) + chef-config (= 15.0.58) chef-zero (>= 13.0) diff-lcs (~> 1.2, >= 1.2.4) erubis (~> 2.7) @@ -57,10 +57,10 @@ PATH specinfra (~> 2.10) syslog-logger (~> 1.6) uuidtools (~> 2.1.5) - chef (15.0.57-universal-mingw32) + chef (15.0.58-universal-mingw32) addressable bundler (>= 1.10) - chef-config (= 15.0.57) + chef-config (= 15.0.58) chef-zero (>= 13.0) diff-lcs (~> 1.2, >= 1.2.4) erubis (~> 2.7) @@ -104,7 +104,7 @@ PATH PATH remote: chef-config specs: - chef-config (15.0.57) + chef-config (15.0.58) addressable fuzzyurl mixlib-config (>= 2.2.12, < 3.0) @@ -1 +1 @@ -15.0.57
\ No newline at end of file +15.0.58
\ No newline at end of file diff --git a/chef-config/lib/chef-config/version.rb b/chef-config/lib/chef-config/version.rb index f7f6932e25..21d47d3d39 100644 --- a/chef-config/lib/chef-config/version.rb +++ b/chef-config/lib/chef-config/version.rb @@ -21,7 +21,7 @@ module ChefConfig CHEFCONFIG_ROOT = File.expand_path("../..", __FILE__) - VERSION = "15.0.57".freeze + VERSION = "15.0.58".freeze end # diff --git a/lib/chef/version.rb b/lib/chef/version.rb index 5bff129d9a..85e775846f 100644 --- a/lib/chef/version.rb +++ b/lib/chef/version.rb @@ -23,7 +23,7 @@ require "chef/version_string" class Chef CHEF_ROOT = File.expand_path("../..", __FILE__) - VERSION = Chef::VersionString.new("15.0.57") + VERSION = Chef::VersionString.new("15.0.58") end # |