summaryrefslogtreecommitdiff
path: root/CHANGELOG.md
diff options
context:
space:
mode:
authorChef Expeditor <eng-services-ops+chef-ci@chef.io>2017-12-01 17:07:02 +0000
committerChef Expeditor <eng-services-ops+chef-ci@chef.io>2017-12-01 17:07:02 +0000
commitfb579ea88499daaf04a97d49b1fc1c44040eec58 (patch)
treebf23954e314e3c5b83554bd8f3989b7df9e082bb /CHANGELOG.md
parent80f2393f6f9f017f6931a162c16dccc701f9db73 (diff)
downloadchef-fb579ea88499daaf04a97d49b1fc1c44040eec58.tar.gz
Update CHANGELOG.md with details from pull request #6611
Diffstat (limited to 'CHANGELOG.md')
-rw-r--r--CHANGELOG.md7
1 files changed, 4 insertions, 3 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 37e222e106..b504d9d675 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,15 +1,16 @@
<!-- usage documentation: http://expeditor-docs.es.chef.io/configuration/changelog/ -->
-<!-- latest_release 13.6.23 -->
-## [v13.6.23](https://github.com/chef/chef/tree/v13.6.23) (2017-11-29)
+<!-- latest_release unreleased -->
+## Unreleased
#### Merged Pull Requests
-- Hide sensitive properties in converge_if_changed. [#6576](https://github.com/chef/chef/pull/6576) ([cma-arnold](https://github.com/cma-arnold))
+- Add Amazon Linux testing to PRs in Travis [#6611](https://github.com/chef/chef/pull/6611) ([tas50](https://github.com/tas50))
<!-- latest_release -->
<!-- release_rollup since=13.6.4 -->
### Changes since 13.6.4 release
#### Merged Pull Requests
+- Add Amazon Linux testing to PRs in Travis [#6611](https://github.com/chef/chef/pull/6611) ([tas50](https://github.com/tas50)) <!-- 13.6.23 -->
- Hide sensitive properties in converge_if_changed. [#6576](https://github.com/chef/chef/pull/6576) ([cma-arnold](https://github.com/cma-arnold)) <!-- 13.6.23 -->
- Bump dependencies to pick up InSpec v1.46.2 [#6609](https://github.com/chef/chef/pull/6609) ([adamleff](https://github.com/adamleff)) <!-- 13.6.22 -->
- Fix windows_path converging on every run [#6541](https://github.com/chef/chef/pull/6541) ([tas50](https://github.com/tas50)) <!-- 13.6.21 -->