summaryrefslogtreecommitdiff
path: root/CHANGELOG.md
diff options
context:
space:
mode:
Diffstat (limited to 'CHANGELOG.md')
-rw-r--r--CHANGELOG.md25
1 files changed, 11 insertions, 14 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index f24dad8c42..131a14fc54 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,22 +1,20 @@
<!-- usage documentation: http://expeditor-docs.es.chef.io/configuration/changelog/ -->
-<!-- latest_release 13.10.4 -->
-## [v13.10.4](https://github.com/chef/chef/tree/v13.10.4) (2018-08-07)
-
-#### Merged Pull Requests
-- [SHACK-290] Unpacking tarball paths suffer from URI error [#7522](https://github.com/chef/chef/pull/7522) ([tyler-ball](https://github.com/tyler-ball))
+<!-- latest_release -->
<!-- latest_release -->
-<!-- release_rollup since=13.10.0 -->
-### Changes since 13.10.0 release
-
-#### Merged Pull Requests
-- [SHACK-290] Unpacking tarball paths suffer from URI error [#7522](https://github.com/chef/chef/pull/7522) ([tyler-ball](https://github.com/tyler-ball)) <!-- 13.10.4 -->
-- Pin to rspec to &lt; 3.8 [#7528](https://github.com/chef/chef/pull/7528) ([cheeseplus](https://github.com/cheeseplus)) <!-- 13.10.3 -->
-- Backport for 13: scrub tempfile names [#7526](https://github.com/chef/chef/pull/7526) ([tyler-ball](https://github.com/tyler-ball)) <!-- 13.10.2 -->
-- Check local file exists before installing a windows package [#7341](https://github.com/chef/chef/pull/7341) ([josh-barker](https://github.com/josh-barker)) <!-- 13.10.1 -->
+<!-- release_rollup -->
<!-- release_rollup -->
<!-- latest_stable_release -->
+## [v13.10.4](https://github.com/chef/chef/tree/v13.10.4) (2018-08-08)
+
+#### Merged Pull Requests
+- Check local file exists before installing a windows package [#7341](https://github.com/chef/chef/pull/7341) ([josh-barker](https://github.com/josh-barker))
+- Backport for 13: scrub tempfile names [#7526](https://github.com/chef/chef/pull/7526) ([tyler-ball](https://github.com/tyler-ball))
+- Pin to rspec to &lt; 3.8 [#7528](https://github.com/chef/chef/pull/7528) ([cheeseplus](https://github.com/cheeseplus))
+- [SHACK-290] Unpacking tarball paths suffer from URI error [#7522](https://github.com/chef/chef/pull/7522) ([tyler-ball](https://github.com/tyler-ball))
+<!-- latest_stable_release -->
+
## [v13.10.0](https://github.com/chef/chef/tree/v13.10.0) (2018-07-11)
#### Merged Pull Requests
@@ -25,7 +23,6 @@
- Bump Ohai to 13.10.0 [#7438](https://github.com/chef/chef/pull/7438) ([tas50](https://github.com/tas50))
- Backport duplicate logger fix [#7447](https://github.com/chef/chef/pull/7447) ([btm](https://github.com/btm))
- Bump to 13.10 and add release notes [#7454](https://github.com/chef/chef/pull/7454) ([tas50](https://github.com/tas50))
-<!-- latest_stable_release -->
## [v13.9.4](https://github.com/chef/chef/tree/v13.9.4) (2018-06-07)