diff options
| author | Chef Versioner <chef-versioner@chef.io> | 2017-04-21 10:42:58 +0000 |
|---|---|---|
| committer | Chef Versioner <chef-versioner@chef.io> | 2017-04-21 10:42:58 +0000 |
| commit | 1cdcff04eb1f0681a778a4e5197865f81fe8abf0 (patch) | |
| tree | 8059e05f718a465dd07f67c7bf05562e68f73738 | |
| parent | f77a70b72717341de934c3e51300074295310673 (diff) | |
| download | chef-13.1.3.tar.gz | |
Bump version of chef to 13.1.3 by Chef Versioner.v13.1.3
| -rw-r--r-- | CHANGELOG.md | 13 | ||||
| -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, 17 insertions, 12 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 470db22c0f..54ceb4ec28 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,14 +1,19 @@ 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 [](https://badge.fury.io/rb/chef). -## [v13.0.122](https://github.com/chef/chef/tree/v13.0.122) (2017-04-20) -[Full Changelog](https://github.com/chef/chef/compare/v13.0.122...v13.0.122) +## [v13.1.2](https://github.com/chef/chef/tree/v13.1.2) (2017-04-21) +[Full Changelog](https://github.com/chef/chef/compare/v13.0.118...v13.1.2) **Merged pull requests:** - add a pointer from the run\_context back to the runner [\#6077](https://github.com/chef/chef/pull/6077) ([lamont-granquist](https://github.com/lamont-granquist)) -## [v13.0.122](https://github.com/chef/chef/tree/v13.0.122) (2017-04-20) -[Full Changelog](https://github.com/chef/chef/compare/v13.0.118...v13.0.122) +## [v13.0.118](https://github.com/chef/chef/tree/v13.0.118) (2017-04-12) +[Full Changelog](https://github.com/chef/chef/compare/v13.1.2...v13.0.118) + +**Merged pull requests:** + +- Fix some fallout from the options converstion to an array [\#6047](https://github.com/chef/chef/pull/6047) ([coderanger](https://github.com/coderanger)) +- Fix for Chef 13 upload reversion. [\#6045](https://github.com/chef/chef/pull/6045) ([coderanger](https://github.com/coderanger)) ## [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 e0c3bd329c..0cb350f6e2 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -96,10 +96,10 @@ GIT PATH remote: . specs: - chef (13.1.2) + chef (13.1.3) addressable bundler (>= 1.10) - chef-config (= 13.1.2) + chef-config (= 13.1.3) chef-zero (>= 13.0) diff-lcs (~> 1.2, >= 1.2.4) erubis (~> 2.7) @@ -126,10 +126,10 @@ PATH specinfra (~> 2.10) syslog-logger (~> 1.6) uuidtools (~> 2.1.5) - chef (13.1.2-universal-mingw32) + chef (13.1.3-universal-mingw32) addressable bundler (>= 1.10) - chef-config (= 13.1.2) + chef-config (= 13.1.3) chef-zero (>= 13.0) diff-lcs (~> 1.2, >= 1.2.4) erubis (~> 2.7) @@ -171,7 +171,7 @@ PATH PATH remote: chef-config specs: - chef-config (13.1.2) + chef-config (13.1.3) addressable fuzzyurl mixlib-config (~> 2.0) @@ -1 +1 @@ -13.1.2 +13.1.3
\ 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 84eb333bc5..3258ee1093 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.2" + VERSION = "13.1.3" end # diff --git a/lib/chef/version.rb b/lib/chef/version.rb index 3a96f6f0c6..570f8826c6 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.2" + VERSION = "13.1.3" end # |