summaryrefslogtreecommitdiff
path: root/CHANGELOG.md
diff options
context:
space:
mode:
authorChef Expeditor <eng-services-ops+chef-ci@chef.io>2017-08-17 17:10:21 +0000
committerChef Expeditor <eng-services-ops+chef-ci@chef.io>2017-08-17 17:10:21 +0000
commitce06d947971624275f7138a4c9b2f1ea0b4b65be (patch)
treef738616a6f6b2988329b4ea1c92ec6e385483447 /CHANGELOG.md
parent50baef2008601b669b70ee6293d920d2b088b930 (diff)
downloadchef-ce06d947971624275f7138a4c9b2f1ea0b4b65be.tar.gz
Bump version to 13.3.50 by Chef Expeditorv13.3.50
Diffstat (limited to 'CHANGELOG.md')
-rw-r--r--CHANGELOG.md9
1 files changed, 5 insertions, 4 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 02b2b8ca0e..c177433b9f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,8 +1,8 @@
-<!-- latest_release 13.3.49 -->
-## [v13.3.49](https://github.com/chef/chef/tree/v13.3.49) (2017-08-17)
+<!-- latest_release 13.3.50 -->
+## [v13.3.50](https://github.com/chef/chef/tree/v13.3.50) (2017-08-17)
#### Merged Pull Requests
-- Add Chef 13.0.113 and 13.0.118 to the changelog [#6334](https://github.com/chef/chef/pull/6334) ([tas50](https://github.com/tas50))
+- Add v12.21.4 to master&#39;s changelog [#6339](https://github.com/chef/chef/pull/6339) ([tas50](https://github.com/tas50))
<!-- latest_release -->
<!-- release_rollup since=13.3.42 -->
@@ -12,6 +12,7 @@
- Pass json configuration to ShellSession class [#6314](https://github.com/chef/chef/pull/6314) ([btm](https://github.com/btm)) <!-- 13.3.47 -->
#### Merged Pull Requests
+- Add v12.21.4 to master&#39;s changelog [#6339](https://github.com/chef/chef/pull/6339) ([tas50](https://github.com/tas50)) <!-- 13.3.50 -->
- Add Chef 13.0.113 and 13.0.118 to the changelog [#6334](https://github.com/chef/chef/pull/6334) ([tas50](https://github.com/tas50)) <!-- 13.3.49 -->
- Add windows_path resource from the Windows cookbook [#6295](https://github.com/chef/chef/pull/6295) ([NimishaS](https://github.com/NimishaS)) <!-- 13.3.48 -->
- Add more items to the 13.3 release notes [#6325](https://github.com/chef/chef/pull/6325) ([tas50](https://github.com/tas50)) <!-- 13.3.43 -->
@@ -1563,4 +1564,4 @@ of partial templates.
* Fixed a bug where nested resources that inherited from Resource::LWRPBase
would not share the same actions/default_action as their parent
* Raise error if a guard_interpreter is specified and a block is passed to a guard (conditional)
-* Allow specifying a guard_interpreter after a conditional on a resource (Fixes #1943)
+* Allow specifying a guard_interpreter after a conditional on a resource (Fixes #1943) \ No newline at end of file