diff options
author | Chef Expeditor <expeditor@chef.io> | 2020-01-21 22:35:57 +0000 |
---|---|---|
committer | Chef Expeditor <expeditor@chef.io> | 2020-01-21 22:35:57 +0000 |
commit | be03916273afa99077f564c895f798f58237ffd0 (patch) | |
tree | da5294bd1fd3d7fb2a044987eb60d9aebc202668 | |
parent | a9fccba06fcd78dfe1e34b21341cf475a6c0caf7 (diff) | |
download | chef-be03916273afa99077f564c895f798f58237ffd0.tar.gz |
Bump version to 15.7.26 by Chef Expeditorv15.7.26
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 6e4dbfea2c..f3463e3af4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,15 +1,16 @@ <!-- usage documentation: http://expeditor-docs.es.chef.io/configuration/changelog/ --> -<!-- latest_release 15.7.25 --> -## [v15.7.25](https://github.com/chef/chef/tree/v15.7.25) (2020-01-17) +<!-- latest_release 15.7.26 --> +## [v15.7.26](https://github.com/chef/chef/tree/v15.7.26) (2020-01-21) #### Merged Pull Requests -- Point at the 15-stable ohai branch [#9240](https://github.com/chef/chef/pull/9240) ([tas50](https://github.com/tas50)) +- Update Ohai to 15.7.4 [#9249](https://github.com/chef/chef/pull/9249) ([tas50](https://github.com/tas50)) <!-- latest_release --> <!-- release_rollup since=15.6.10 --> ### Changes not yet released to stable #### Merged Pull Requests +- Update Ohai to 15.7.4 [#9249](https://github.com/chef/chef/pull/9249) ([tas50](https://github.com/tas50)) <!-- 15.7.26 --> - Point at the 15-stable ohai branch [#9240](https://github.com/chef/chef/pull/9240) ([tas50](https://github.com/tas50)) <!-- 15.7.25 --> - Prep the chef-15 branch to build stable releases [#9236](https://github.com/chef/chef/pull/9236) ([tas50](https://github.com/tas50)) <!-- 15.7.24 --> - Remove RHEL 6 s390x (zLinux) support [#9233](https://github.com/chef/chef/pull/9233) ([jaymalasinha](https://github.com/jaymalasinha)) <!-- 15.7.23 --> diff --git a/Gemfile.lock b/Gemfile.lock index 9b90e2804a..ce9911371d 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -27,12 +27,12 @@ GIT PATH remote: . specs: - chef (15.7.25) + chef (15.7.26) addressable bcrypt_pbkdf (~> 1.0) bundler (>= 1.10) - chef-config (= 15.7.25) - chef-utils (= 15.7.25) + chef-config (= 15.7.26) + chef-utils (= 15.7.26) 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.7.25-universal-mingw32) + chef (15.7.26-universal-mingw32) addressable bcrypt_pbkdf (~> 1.0) bundler (>= 1.10) - chef-config (= 15.7.25) - chef-utils (= 15.7.25) + chef-config (= 15.7.26) + chef-utils (= 15.7.26) 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.7.25) - chef (= 15.7.25) + chef-bin (15.7.26) + chef (= 15.7.26) PATH remote: chef-config specs: - chef-config (15.7.25) + chef-config (15.7.26) addressable - chef-utils (= 15.7.25) + chef-utils (= 15.7.26) 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.7.25) + chef-utils (15.7.26) GEM remote: https://rubygems.org/ @@ -1 +1 @@ -15.7.25
\ No newline at end of file +15.7.26
\ 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 c4207f385c..9a9dbc7941 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.7.25".freeze + VERSION = "15.7.26".freeze end # diff --git a/chef-config/lib/chef-config/version.rb b/chef-config/lib/chef-config/version.rb index 86902e8b3c..6d64d5fe43 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.7.25".freeze + VERSION = "15.7.26".freeze end diff --git a/chef-utils/lib/chef-utils/version.rb b/chef-utils/lib/chef-utils/version.rb index f174c8f2d2..94e679d1b1 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.7.25".freeze + VERSION = "15.7.26".freeze end diff --git a/lib/chef/version.rb b/lib/chef/version.rb index 84182cfec6..9985d2acd6 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.7.25") + VERSION = Chef::VersionString.new("15.7.26") end # |