diff options
author | Chef Expeditor <eng-services-ops+chef-ci@chef.io> | 2017-07-20 02:16:35 +0000 |
---|---|---|
committer | Chef Expeditor <eng-services-ops+chef-ci@chef.io> | 2017-07-20 02:16:35 +0000 |
commit | 020c42b59503692742e6298a35d1bf4b1d2b491c (patch) | |
tree | ae2aaac0d90d795481794e5ce314a3bf07291105 | |
parent | 00761075e711b658bad30dccce27c44e64d121d7 (diff) | |
download | chef-020c42b59503692742e6298a35d1bf4b1d2b491c.tar.gz |
Bump version to 13.3.18 by Chef Expeditorv13.3.18
-rw-r--r-- | CHANGELOG.md | 6 | ||||
-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, 11 insertions, 11 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 26ead56944..bf95e68e46 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,7 +1,7 @@ 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.3.17](https://github.com/chef/chef/tree/v13.3.17) (2017-07-18) -[Full Changelog](https://github.com/chef/chef/compare/v13.0.118...v13.3.17) +## [v13.3.18](https://github.com/chef/chef/tree/v13.3.18) (2017-07-20) +[Full Changelog](https://github.com/chef/chef/compare/v13.0.118...v13.3.18) **Closed issues:** @@ -9,6 +9,7 @@ This changelog reflects the current state of chef's master branch on github and **Merged pull requests:** +- Bump mixlib-shellout for \#6271 [\#6285](https://github.com/chef/chef/pull/6285) ([btm](https://github.com/btm)) - Use new Expeditor config format [\#6272](https://github.com/chef/chef/pull/6272) ([tduffield](https://github.com/tduffield)) - \[MSYS-590\]Make mount idempotent on Aix [\#6213](https://github.com/chef/chef/pull/6213) ([NAshwini](https://github.com/NAshwini)) - \[MSYS-586\] Allow windows\_task create action to update tasks. [\#6193](https://github.com/chef/chef/pull/6193) ([harikesh-kolekar](https://github.com/harikesh-kolekar)) @@ -19,7 +20,6 @@ This changelog reflects the current state of chef's master branch on github and - 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)) - \[MSYS-563\] Modified error message to explain connectivity issue due to Proxy [\#6142](https://github.com/chef/chef/pull/6142) ([NimishaS](https://github.com/NimishaS)) -- Fixing broken functional test in windows\_task resource [\#6139](https://github.com/chef/chef/pull/6139) ([NimishaS](https://github.com/NimishaS)) ## [v12.19.33](https://github.com/chef/chef/tree/v12.19.33) (2017-02-16) [Full Changelog](https://github.com/chef/chef/compare/v12.18.31...v12.19.33) diff --git a/Gemfile.lock b/Gemfile.lock index 37ebf6d4c0..ef9f833290 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -30,10 +30,10 @@ GIT PATH remote: . specs: - chef (13.3.17) + chef (13.3.18) addressable bundler (>= 1.10) - chef-config (= 13.3.17) + chef-config (= 13.3.18) 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.3.17-universal-mingw32) + chef (13.3.18-universal-mingw32) addressable bundler (>= 1.10) - chef-config (= 13.3.17) + chef-config (= 13.3.18) 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.3.17) + chef-config (13.3.18) addressable fuzzyurl mixlib-config (~> 2.0) @@ -1 +1 @@ -13.3.17
\ No newline at end of file +13.3.18
\ 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 e9d5fbb191..26c0d22fd6 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.3.17" + VERSION = "13.3.18" end # diff --git a/lib/chef/version.rb b/lib/chef/version.rb index aeebb0eb8b..5d232693f6 100644 --- a/lib/chef/version.rb +++ b/lib/chef/version.rb @@ -23,7 +23,7 @@ require "chef/version_string" class Chef CHEF_ROOT = File.expand_path("../..", __FILE__) - VERSION = Chef::VersionString.new("13.3.17") + VERSION = Chef::VersionString.new("13.3.18") end # |