summaryrefslogtreecommitdiff
path: root/CHANGELOG.md
diff options
context:
space:
mode:
authorChef Versioner <chef-versioner@chef.io>2017-04-21 10:42:58 +0000
committerChef Versioner <chef-versioner@chef.io>2017-04-21 10:42:58 +0000
commit1cdcff04eb1f0681a778a4e5197865f81fe8abf0 (patch)
tree8059e05f718a465dd07f67c7bf05562e68f73738 /CHANGELOG.md
parentf77a70b72717341de934c3e51300074295310673 (diff)
downloadchef-13.1.3.tar.gz
Bump version of chef to 13.1.3 by Chef Versioner.v13.1.3
Diffstat (limited to 'CHANGELOG.md')
-rw-r--r--CHANGELOG.md13
1 files changed, 9 insertions, 4 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 [![Gem Version](https://badge.fury.io/rb/chef.svg)](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)