diff options
author | Chef Versioner <chef-versioner@chef.io> | 2017-05-25 19:07:35 +0000 |
---|---|---|
committer | Chef Versioner <chef-versioner@chef.io> | 2017-05-25 19:07:35 +0000 |
commit | daaeeb1a597c603e0f0c8bf8adb42e2e68ab241d (patch) | |
tree | 5e87cd6b34950745882d803a091e872b1c7e386d | |
parent | f8eb313a0ab9e8b3e15e0be02be2945824e3f174 (diff) | |
download | chef-daaeeb1a597c603e0f0c8bf8adb42e2e68ab241d.tar.gz |
Bump version of chef to 13.1.26 by Chef Versioner.v13.1.26
-rw-r--r-- | CHANGELOG.md | 15 | ||||
-rw-r--r-- | Gemfile.lock | 10 | ||||
-rw-r--r-- | VERSION | 2 | ||||
-rw-r--r-- | chef-config/lib/chef-config/version.rb | 2 | ||||
-rw-r--r-- | lib/chef/version.rb | 2 |
5 files changed, 21 insertions, 10 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 0af9d04a06..2f21137948 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,7 +1,14 @@ This changelog reflects the current state of chef's master branch on github and may not reflect the current released version of chef, which is [![Gem Version](https://badge.fury.io/rb/chef.svg)](https://badge.fury.io/rb/chef). -## [v13.1.24](https://github.com/chef/chef/tree/v13.1.24) (2017-05-24) -[Full Changelog](https://github.com/chef/chef/compare/v12.20.3...v13.1.24) +## [v13.1.25](https://github.com/chef/chef/tree/v13.1.25) (2017-05-25) +[Full Changelog](https://github.com/chef/chef/compare/v13.1.25...v13.1.25) + +**Merged pull requests:** + +- convert breakpoint resource to a custom resource [\#6176](https://github.com/chef/chef/pull/6176) ([lamont-granquist](https://github.com/lamont-granquist)) + +## [v13.1.25](https://github.com/chef/chef/tree/v13.1.25) (2017-05-24) +[Full Changelog](https://github.com/chef/chef/compare/v12.20.3...v13.1.25) **Closed issues:** @@ -9,6 +16,10 @@ This changelog reflects the current state of chef's master branch on github and **Merged pull requests:** +- Make non-legacy solo use socketless mode [\#6174](https://github.com/chef/chef/pull/6174) ([coderanger](https://github.com/coderanger)) +- Prefer Systemd with sysvinit script over Upstart for service provider [\#6157](https://github.com/chef/chef/pull/6157) ([shortdudey123](https://github.com/shortdudey123)) +- Prefer Systemd with sysvinit script over Upstart for service provider [\#6156](https://github.com/chef/chef/pull/6156) ([shortdudey123](https://github.com/shortdudey123)) +- Ensure that we check the embedded gem binary last [\#6154](https://github.com/chef/chef/pull/6154) ([thommay](https://github.com/thommay)) - Fixing broken functional test in windows\_task resource [\#6139](https://github.com/chef/chef/pull/6139) ([NimishaS](https://github.com/NimishaS)) - Discard caches for files not in the manifest [\#6129](https://github.com/chef/chef/pull/6129) ([akitada](https://github.com/akitada)) - User on Windows with group incorrectly warns about passing GID [\#6125](https://github.com/chef/chef/pull/6125) ([harikesh-kolekar](https://github.com/harikesh-kolekar)) diff --git a/Gemfile.lock b/Gemfile.lock index 1586b099ba..278774a2f2 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -30,10 +30,10 @@ GIT PATH remote: . specs: - chef (13.1.25) + chef (13.1.26) addressable bundler (>= 1.10) - chef-config (= 13.1.25) + chef-config (= 13.1.26) chef-zero (>= 13.0) diff-lcs (~> 1.2, >= 1.2.4) erubis (~> 2.7) @@ -60,10 +60,10 @@ PATH specinfra (~> 2.10) syslog-logger (~> 1.6) uuidtools (~> 2.1.5) - chef (13.1.25-universal-mingw32) + chef (13.1.26-universal-mingw32) addressable bundler (>= 1.10) - chef-config (= 13.1.25) + chef-config (= 13.1.26) chef-zero (>= 13.0) diff-lcs (~> 1.2, >= 1.2.4) erubis (~> 2.7) @@ -105,7 +105,7 @@ PATH PATH remote: chef-config specs: - chef-config (13.1.25) + chef-config (13.1.26) addressable fuzzyurl mixlib-config (~> 2.0) @@ -1 +1 @@ -13.1.25
\ No newline at end of file +13.1.26
\ No newline at end of file diff --git a/chef-config/lib/chef-config/version.rb b/chef-config/lib/chef-config/version.rb index 7e4ab58bc6..ede71472a9 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 = "13.1.25" + VERSION = "13.1.26" end # diff --git a/lib/chef/version.rb b/lib/chef/version.rb index 196aeead5d..aab46a6c7c 100644 --- a/lib/chef/version.rb +++ b/lib/chef/version.rb @@ -21,7 +21,7 @@ class Chef CHEF_ROOT = File.expand_path("../..", __FILE__) - VERSION = "13.1.25" + VERSION = "13.1.26" end # |