diff options
author | Chef Expeditor <expeditor@chef.io> | 2019-09-25 05:39:12 +0000 |
---|---|---|
committer | Chef Expeditor <expeditor@chef.io> | 2019-09-25 05:39:12 +0000 |
commit | fc1ec86994aa00c39cd7a8acb52a6e02267bc885 (patch) | |
tree | c0aa3f808acf3e1074d6def1eb87152251dcaf65 | |
parent | 6170a22a37886c18a92f370ab35a4ddacdbb2afd (diff) | |
download | chef-fc1ec86994aa00c39cd7a8acb52a6e02267bc885.tar.gz |
Bump version to 15.4.6 by Chef Expeditorv15.4.6
Obvious fix; these changes are the result of automation not creative thinking.
-rw-r--r-- | CHANGELOG.md | 7 | ||||
-rw-r--r-- | Gemfile.lock | 14 | ||||
-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-- | lib/chef/version.rb | 2 |
6 files changed, 15 insertions, 14 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 52bcc0e298..3e9e83aa6b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,15 +1,16 @@ <!-- usage documentation: http://expeditor-docs.es.chef.io/configuration/changelog/ --> -<!-- latest_release 15.4.5 --> -## [v15.4.5](https://github.com/chef/chef/tree/v15.4.5) (2019-09-24) +<!-- latest_release 15.4.6 --> +## [v15.4.6](https://github.com/chef/chef/tree/v15.4.6) (2019-09-25) #### Merged Pull Requests -- fix converge_if_changed to compare default values [#8912](https://github.com/chef/chef/pull/8912) ([lamont-granquist](https://github.com/lamont-granquist)) +- Require train-winrm >= 0.2.5 [#8914](https://github.com/chef/chef/pull/8914) ([tas50](https://github.com/tas50)) <!-- latest_release --> <!-- release_rollup since=15.3.14 --> ### Changes not yet released to stable #### Merged Pull Requests +- Require train-winrm >= 0.2.5 [#8914](https://github.com/chef/chef/pull/8914) ([tas50](https://github.com/tas50)) <!-- 15.4.6 --> - fix converge_if_changed to compare default values [#8912](https://github.com/chef/chef/pull/8912) ([lamont-granquist](https://github.com/lamont-granquist)) <!-- 15.4.5 --> - Add empty chefcli config_context to fix commands with chefcli in knife.rb [#8911](https://github.com/chef/chef/pull/8911) ([coding-blip](https://github.com/coding-blip)) <!-- 15.4.4 --> - bump gems [#8907](https://github.com/chef/chef/pull/8907) ([lamont-granquist](https://github.com/lamont-granquist)) <!-- 15.4.3 --> diff --git a/Gemfile.lock b/Gemfile.lock index 5883d5db7d..d214ada8d6 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -27,11 +27,11 @@ GIT PATH remote: . specs: - chef (15.4.5) + chef (15.4.6) addressable bcrypt_pbkdf (~> 1.0) bundler (>= 1.10) - chef-config (= 15.4.5) + chef-config (= 15.4.6) chef-zero (>= 14.0.11) diff-lcs (~> 1.2, >= 1.2.4) ed25519 (~> 1.2) @@ -58,11 +58,11 @@ PATH train-winrm (>= 0.2.5) tty-screen (~> 0.6) uuidtools (~> 2.1.5) - chef (15.4.5-universal-mingw32) + chef (15.4.6-universal-mingw32) addressable bcrypt_pbkdf (~> 1.0) bundler (>= 1.10) - chef-config (= 15.4.5) + chef-config (= 15.4.6) chef-zero (>= 14.0.11) diff-lcs (~> 1.2, >= 1.2.4) ed25519 (~> 1.2) @@ -105,13 +105,13 @@ PATH PATH remote: chef-bin specs: - chef-bin (15.4.5) - chef (= 15.4.5) + chef-bin (15.4.6) + chef (= 15.4.6) PATH remote: chef-config specs: - chef-config (15.4.5) + chef-config (15.4.6) addressable fuzzyurl mixlib-config (>= 2.2.12, < 4.0) @@ -1 +1 @@ -15.4.5
\ No newline at end of file +15.4.6
\ 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 c51d32af95..14adc0aa2a 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 = "15.4.5".freeze + VERSION = "15.4.6".freeze end # diff --git a/chef-config/lib/chef-config/version.rb b/chef-config/lib/chef-config/version.rb index d5c7998ca1..deaf56a159 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.4.5".freeze + VERSION = "15.4.6".freeze end # diff --git a/lib/chef/version.rb b/lib/chef/version.rb index 941b751e85..fccecb3a2d 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("15.4.5") + VERSION = Chef::VersionString.new("15.4.6") end # |