diff --git a/CHANGELOG.md b/CHANGELOG.md index 8ddad5af9fb4c7..8c346784df1812 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -33,7 +33,8 @@ release. -10.2.0
+10.2.1
+10.2.0
10.1.0
10.0.0
diff --git a/doc/changelogs/CHANGELOG_V10.md b/doc/changelogs/CHANGELOG_V10.md index 389903433aa3e1..dbaed9a91e5f1d 100644 --- a/doc/changelogs/CHANGELOG_V10.md +++ b/doc/changelogs/CHANGELOG_V10.md @@ -9,6 +9,7 @@ +10.2.1
10.2.0
10.1.0
10.0.0
@@ -28,6 +29,19 @@ * [io.js](CHANGELOG_IOJS.md) * [Archive](CHANGELOG_ARCHIVE.md) + +## 2018-05-24, Version 10.2.1 (Current), @MylesBorins + +### Notable Changes + +This is a follow up release to fix two regressions that were introduced in v10.2.0. + +### Commits + +* [[`2a9c83321b`](https://github.com/nodejs/node/commit/2a9c83321b)] - **http**: fix res emit close before user finish (Robert Nagy) [#20941](https://github.com/nodejs/node/pull/20941) +* [[`0b1ba20fc0`](https://github.com/nodejs/node/commit/0b1ba20fc0)] - **src**: re-integrate headers into node.h (Anna Henningsen) [#20939](https://github.com/nodejs/node/pull/20939) +* [[`52f21fbfbc`](https://github.com/nodejs/node/commit/52f21fbfbc)] - **test**: mark test-zlib.zlib-binding.deflate as flaky (Matheus Marchini) [#20935](https://github.com/nodejs/node/pull/20935) + ## 2018-05-23, Version 10.2.0 (Current), @MylesBorins