diff options
author | Chef Expeditor <expeditor@chef.io> | 2020-06-23 16:21:24 +0000 |
---|---|---|
committer | Chef Expeditor <expeditor@chef.io> | 2020-06-23 16:21:24 +0000 |
commit | a34fd84377c705fcdf3a415b40300e11c3cacf35 (patch) | |
tree | 7b22451f406a71a4826c4cbb962958cfd89b5f8d | |
parent | e5cbe8e7f9313bd6ae8c2c336fb4f0d9332b978f (diff) | |
download | chef-a34fd84377c705fcdf3a415b40300e11c3cacf35.tar.gz |
Bump version to 15.12.5 by Chef Expeditorv15.12.5
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 e239d77515..f298607e8d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,15 +1,16 @@ <!-- usage documentation: http://expeditor-docs.es.chef.io/configuration/changelog/ --> -<!-- latest_release 15.12.4 --> -## [v15.12.4](https://github.com/chef/chef/tree/v15.12.4) (2020-06-23) +<!-- latest_release 15.12.5 --> +## [v15.12.5](https://github.com/chef/chef/tree/v15.12.5) (2020-06-23) #### Merged Pull Requests -- Fix zypper_repository key handling on SLES 15+ [#10030](https://github.com/chef/chef/pull/10030) ([tas50](https://github.com/tas50)) +- Support for AIX and Solaris in cron_allow resource [#10036](https://github.com/chef/chef/pull/10036) ([tas50](https://github.com/tas50)) <!-- latest_release --> <!-- release_rollup since=15.11.8 --> ### Changes not yet released to stable #### Merged Pull Requests +- Support for AIX and Solaris in cron_allow resource [#10036](https://github.com/chef/chef/pull/10036) ([tas50](https://github.com/tas50)) <!-- 15.12.5 --> - Fix zypper_repository key handling on SLES 15+ [#10030](https://github.com/chef/chef/pull/10030) ([tas50](https://github.com/tas50)) <!-- 15.12.4 --> - Fixed Powershell_Package does not throw error when it cannot connect to powershell gallery [#10032](https://github.com/chef/chef/pull/10032) ([tas50](https://github.com/tas50)) <!-- 15.12.3 --> - archive_file: move ffi-libarchive into a simple helper method [#10033](https://github.com/chef/chef/pull/10033) ([tas50](https://github.com/tas50)) <!-- 15.12.2 --> diff --git a/Gemfile.lock b/Gemfile.lock index df955b1476..79f51da368 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -27,12 +27,12 @@ GIT PATH remote: . specs: - chef (15.12.4) + chef (15.12.5) addressable bcrypt_pbkdf (~> 1.0) bundler (>= 1.10) - chef-config (= 15.12.4) - chef-utils (= 15.12.4) + chef-config (= 15.12.5) + chef-utils (= 15.12.5) 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.12.4-universal-mingw32) + chef (15.12.5-universal-mingw32) addressable bcrypt_pbkdf (~> 1.0) bundler (>= 1.10) - chef-config (= 15.12.4) - chef-utils (= 15.12.4) + chef-config (= 15.12.5) + chef-utils (= 15.12.5) 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.12.4) - chef (= 15.12.4) + chef-bin (15.12.5) + chef (= 15.12.5) PATH remote: chef-config specs: - chef-config (15.12.4) + chef-config (15.12.5) addressable - chef-utils (= 15.12.4) + chef-utils (= 15.12.5) 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.12.4) + chef-utils (15.12.5) GEM remote: https://rubygems.org/ @@ -1 +1 @@ -15.12.4
\ No newline at end of file +15.12.5
\ 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 dd2a167f44..c4299ac915 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.12.4".freeze + VERSION = "15.12.5".freeze end # diff --git a/chef-config/lib/chef-config/version.rb b/chef-config/lib/chef-config/version.rb index f0e69c37d0..bc9a4fad9a 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.12.4".freeze + VERSION = "15.12.5".freeze end diff --git a/chef-utils/lib/chef-utils/version.rb b/chef-utils/lib/chef-utils/version.rb index 7c8e458b0f..cd85999c13 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.12.4".freeze + VERSION = "15.12.5".freeze end diff --git a/lib/chef/version.rb b/lib/chef/version.rb index 46f028b0f9..f737c880c2 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.12.4") + VERSION = Chef::VersionString.new("15.12.5") end # |