diff options
| -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 b60a05a9bb..0acdd556db 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,15 +1,16 @@ <!-- usage documentation: http://expeditor-docs.es.chef.io/configuration/changelog/ --> -<!-- latest_release 15.10.0 --> -## [v15.10.0](https://github.com/chef/chef/tree/v15.10.0) (2020-04-10) +<!-- latest_release 15.10.1 --> +## [v15.10.1](https://github.com/chef/chef/tree/v15.10.1) (2020-04-13) #### Merged Pull Requests -- Add arm? helper to chef-utils [#9651](https://github.com/chef/chef/pull/9651) ([tas50](https://github.com/tas50)) +- Fix knife bootstrap_version CLI option overriding config option [#9650](https://github.com/chef/chef/pull/9650) ([tas50](https://github.com/tas50)) <!-- latest_release --> <!-- release_rollup since=15.9.17 --> ### Changes not yet released to stable #### Merged Pull Requests +- Fix knife bootstrap_version CLI option overriding config option [#9650](https://github.com/chef/chef/pull/9650) ([tas50](https://github.com/tas50)) <!-- 15.10.1 --> - Add arm? helper to chef-utils [#9651](https://github.com/chef/chef/pull/9651) ([tas50](https://github.com/tas50)) <!-- 15.10.0 --> - Spell checking in comments and log messages [#9630](https://github.com/chef/chef/pull/9630) ([tas50](https://github.com/tas50)) <!-- 15.9.23 --> - Fixed systemd_unit not respecting sensitive property [#9631](https://github.com/chef/chef/pull/9631) ([tas50](https://github.com/tas50)) <!-- 15.9.22 --> diff --git a/Gemfile.lock b/Gemfile.lock index a92ba281a8..7949cbfeff 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -27,12 +27,12 @@ GIT PATH remote: . specs: - chef (15.10.0) + chef (15.10.1) addressable bcrypt_pbkdf (~> 1.0) bundler (>= 1.10) - chef-config (= 15.10.0) - chef-utils (= 15.10.0) + chef-config (= 15.10.1) + chef-utils (= 15.10.1) chef-zero (>= 14.0.11) diff-lcs (~> 1.2, >= 1.2.4) ed25519 (~> 1.2) @@ -59,12 +59,12 @@ PATH train-winrm (>= 0.2.5) tty-screen (~> 0.6) uuidtools (~> 2.1.5) - chef (15.10.0-universal-mingw32) + chef (15.10.1-universal-mingw32) addressable bcrypt_pbkdf (~> 1.0) bundler (>= 1.10) - chef-config (= 15.10.0) - chef-utils (= 15.10.0) + chef-config (= 15.10.1) + chef-utils (= 15.10.1) chef-zero (>= 14.0.11) diff-lcs (~> 1.2, >= 1.2.4) ed25519 (~> 1.2) @@ -107,15 +107,15 @@ PATH PATH remote: chef-bin specs: - chef-bin (15.10.0) - chef (= 15.10.0) + chef-bin (15.10.1) + chef (= 15.10.1) PATH remote: chef-config specs: - chef-config (15.10.0) + chef-config (15.10.1) addressable - chef-utils (= 15.10.0) + chef-utils (= 15.10.1) fuzzyurl mixlib-config (>= 2.2.12, < 4.0) mixlib-shellout (>= 2.0, < 4.0) @@ -124,7 +124,7 @@ PATH PATH remote: chef-utils specs: - chef-utils (15.10.0) + chef-utils (15.10.1) GEM remote: https://rubygems.org/ @@ -1 +1 @@ -15.10.0
\ No newline at end of file +15.10.1
\ 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 2b293ec253..b5298d8f63 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.10.0".freeze + VERSION = "15.10.1".freeze end # diff --git a/chef-config/lib/chef-config/version.rb b/chef-config/lib/chef-config/version.rb index 3c881f1ed9..8a7c2b4ee3 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 = "15.10.0".freeze + VERSION = "15.10.1".freeze end diff --git a/chef-utils/lib/chef-utils/version.rb b/chef-utils/lib/chef-utils/version.rb index 3d6d0b11f8..9d39e200e7 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 = "15.10.0".freeze + VERSION = "15.10.1".freeze end diff --git a/lib/chef/version.rb b/lib/chef/version.rb index 8bbd3ffd74..cf3187e872 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.10.0") + VERSION = Chef::VersionString.new("15.10.1") end # |