diff options
author | Chef Expeditor <chef-ci@chef.io> | 2019-06-25 06:37:41 +0000 |
---|---|---|
committer | Chef Expeditor <chef-ci@chef.io> | 2019-06-25 06:37:41 +0000 |
commit | 3b2495c5a2c6cc4e558b11a6ddb0328643907a8c (patch) | |
tree | 1c2bef2fc895989447c58ec99f1c8a05bb2c085d | |
parent | aaea1f2956591f14912237c26db116d13c2ffc99 (diff) | |
download | chef-3b2495c5a2c6cc4e558b11a6ddb0328643907a8c.tar.gz |
Bump version to 15.1.26 by Chef Expeditorv15.1.26
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 a2b0b9d52c..1409ca04fd 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,15 +1,16 @@ <!-- usage documentation: http://expeditor-docs.es.chef.io/configuration/changelog/ --> -<!-- latest_release 15.1.25 --> -## [v15.1.25](https://github.com/chef/chef/tree/v15.1.25) (2019-06-25) +<!-- latest_release 15.1.26 --> +## [v15.1.26](https://github.com/chef/chef/tree/v15.1.26) (2019-06-25) #### Merged Pull Requests -- Pin to ruby-prof 0.17 [#8690](https://github.com/chef/chef/pull/8690) ([tas50](https://github.com/tas50)) +- Improve how we bundler install in appveyor [#8663](https://github.com/chef/chef/pull/8663) ([tas50](https://github.com/tas50)) <!-- latest_release --> <!-- release_rollup since=15.0.300 --> ### Changes not yet released to rubygems.org #### Merged Pull Requests +- Improve how we bundler install in appveyor [#8663](https://github.com/chef/chef/pull/8663) ([tas50](https://github.com/tas50)) <!-- 15.1.26 --> - Pin to ruby-prof 0.17 [#8690](https://github.com/chef/chef/pull/8690) ([tas50](https://github.com/tas50)) <!-- 15.1.25 --> - Update Rubygems to 3.0.4 [#8689](https://github.com/chef/chef/pull/8689) ([tas50](https://github.com/tas50)) <!-- 15.1.24 --> - [scaffolding-chef] Rolling out the scaffolding-chef package [#8679](https://github.com/chef/chef/pull/8679) ([echohack](https://github.com/echohack)) <!-- 15.1.23 --> diff --git a/Gemfile.lock b/Gemfile.lock index 37dfe90edc..b6751b71ed 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -27,11 +27,11 @@ GIT PATH remote: . specs: - chef (15.1.25) + chef (15.1.26) addressable bcrypt_pbkdf (~> 1.0) bundler (>= 1.10) - chef-config (= 15.1.25) + chef-config (= 15.1.26) chef-zero (>= 14.0.11) diff-lcs (~> 1.2, >= 1.2.4) ed25519 (~> 1.2) @@ -57,11 +57,11 @@ PATH train-core (~> 2.0, >= 2.0.12) tty-screen (~> 0.6) uuidtools (~> 2.1.5) - chef (15.1.25-universal-mingw32) + chef (15.1.26-universal-mingw32) addressable bcrypt_pbkdf (~> 1.0) bundler (>= 1.10) - chef-config (= 15.1.25) + chef-config (= 15.1.26) chef-zero (>= 14.0.11) diff-lcs (~> 1.2, >= 1.2.4) ed25519 (~> 1.2) @@ -103,13 +103,13 @@ PATH PATH remote: chef-bin specs: - chef-bin (15.1.25) - chef (= 15.1.25) + chef-bin (15.1.26) + chef (= 15.1.26) PATH remote: chef-config specs: - chef-config (15.1.25) + chef-config (15.1.26) addressable fuzzyurl mixlib-config (>= 2.2.12, < 4.0) @@ -1 +1 @@ -15.1.25
\ No newline at end of file +15.1.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 aea2c87a37..9a650287cb 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.1.25".freeze + VERSION = "15.1.26".freeze end # diff --git a/chef-config/lib/chef-config/version.rb b/chef-config/lib/chef-config/version.rb index 417c827e5f..50f4922a31 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.1.25".freeze + VERSION = "15.1.26".freeze end # diff --git a/lib/chef/version.rb b/lib/chef/version.rb index 14f3f9f81c..cb550b8066 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.1.25") + VERSION = Chef::VersionString.new("15.1.26") end # |