diff options
author | Chef Expeditor <expeditor@chef.io> | 2020-04-21 22:29:45 +0000 |
---|---|---|
committer | Chef Expeditor <expeditor@chef.io> | 2020-04-21 22:29:45 +0000 |
commit | 992428b811ff78cad4c0fcbda17f385afc9287a0 (patch) | |
tree | c62ecd5ae573a2cdb3b99a0fe60667b6f45bf0c2 | |
parent | 593958274c274e97dae976c85403555935a82aa9 (diff) | |
download | chef-992428b811ff78cad4c0fcbda17f385afc9287a0.tar.gz |
Bump version to 15.10.12 by Chef Expeditorv15.10.12
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 4e1501c08e..82bb8c6477 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.11 --> -## [v15.10.11](https://github.com/chef/chef/tree/v15.10.11) (2020-04-21) +<!-- latest_release 15.10.12 --> +## [v15.10.12](https://github.com/chef/chef/tree/v15.10.12) (2020-04-21) #### Merged Pull Requests -- Update omnibus-software to resolve shipping 2 copies of pry [#9701](https://github.com/chef/chef/pull/9701) ([tas50](https://github.com/tas50)) +- Update Ohai to 15.9 [#9707](https://github.com/chef/chef/pull/9707) ([tas50](https://github.com/tas50)) <!-- latest_release --> <!-- release_rollup since=15.9.17 --> ### Changes not yet released to stable #### Merged Pull Requests +- Update Ohai to 15.9 [#9707](https://github.com/chef/chef/pull/9707) ([tas50](https://github.com/tas50)) <!-- 15.10.12 --> - Update omnibus-software to resolve shipping 2 copies of pry [#9701](https://github.com/chef/chef/pull/9701) ([tas50](https://github.com/tas50)) <!-- 15.10.11 --> - Remove "Code Can" from dmg background [#9702](https://github.com/chef/chef/pull/9702) ([tas50](https://github.com/tas50)) <!-- 15.10.10 --> - Produce aarch64 Amazon Linux 2 packages [#9680](https://github.com/chef/chef/pull/9680) ([tas50](https://github.com/tas50)) <!-- 15.10.9 --> diff --git a/Gemfile.lock b/Gemfile.lock index fac6123fdd..5d4815b6e4 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -27,12 +27,12 @@ GIT PATH remote: . specs: - chef (15.10.11) + chef (15.10.12) addressable bcrypt_pbkdf (~> 1.0) bundler (>= 1.10) - chef-config (= 15.10.11) - chef-utils (= 15.10.11) + chef-config (= 15.10.12) + chef-utils (= 15.10.12) 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.11-universal-mingw32) + chef (15.10.12-universal-mingw32) addressable bcrypt_pbkdf (~> 1.0) bundler (>= 1.10) - chef-config (= 15.10.11) - chef-utils (= 15.10.11) + chef-config (= 15.10.12) + chef-utils (= 15.10.12) 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.11) - chef (= 15.10.11) + chef-bin (15.10.12) + chef (= 15.10.12) PATH remote: chef-config specs: - chef-config (15.10.11) + chef-config (15.10.12) addressable - chef-utils (= 15.10.11) + chef-utils (= 15.10.12) 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.11) + chef-utils (15.10.12) GEM remote: https://rubygems.org/ @@ -1 +1 @@ -15.10.11
\ No newline at end of file +15.10.12
\ 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 1e5ab00f55..0936104e33 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.11".freeze + VERSION = "15.10.12".freeze end # diff --git a/chef-config/lib/chef-config/version.rb b/chef-config/lib/chef-config/version.rb index 1dd065df65..d6b7f58360 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.11".freeze + VERSION = "15.10.12".freeze end diff --git a/chef-utils/lib/chef-utils/version.rb b/chef-utils/lib/chef-utils/version.rb index d61f2183ae..bc889fcf8c 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.11".freeze + VERSION = "15.10.12".freeze end diff --git a/lib/chef/version.rb b/lib/chef/version.rb index 35058545cd..bff7304994 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.11") + VERSION = Chef::VersionString.new("15.10.12") end # |