From 6caecc614a73ffce78fcac0d74e2038cfd05d16a Mon Sep 17 00:00:00 2001
From: Myles Borins <mylesborins@google.com>
Date: Thu, 24 May 2018 13:31:04 -0400
Subject: [PATCH] 2018-05-24, Version 10.2.1 (Current)

This is a follow up release to fix two regressions that were introduced
in v10.2.0.

PR-URL: https://github.com/nodejs/node/pull/20943
---
 CHANGELOG.md                    |  3 ++-
 doc/changelogs/CHANGELOG_V10.md | 14 ++++++++++++++
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1d3d600413d..19eba144fd2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -33,7 +33,8 @@ release.
 </tr>
 <tr>
     <td valign="top">
-<b><a href="doc/changelogs/CHANGELOG_V10.md#10.2.0">10.2.0</a></b><br/>
+<b><a href="doc/changelogs/CHANGELOG_V10.md#10.2.1">10.2.1</a></b><br/>
+<a href="doc/changelogs/CHANGELOG_V10.md#10.2.0">10.2.0</a><br/>
 <a href="doc/changelogs/CHANGELOG_V10.md#10.1.0">10.1.0</a><br/>
 <a href="doc/changelogs/CHANGELOG_V10.md#10.0.0">10.0.0</a><br/>
     </td>
diff --git a/doc/changelogs/CHANGELOG_V10.md b/doc/changelogs/CHANGELOG_V10.md
index 389903433aa..dbaed9a91e5 100644
--- a/doc/changelogs/CHANGELOG_V10.md
+++ b/doc/changelogs/CHANGELOG_V10.md
@@ -9,6 +9,7 @@
 </tr>
 <tr>
 <td>
+<a href="#10.2.1">10.2.1</a><br/>
 <a href="#10.2.0">10.2.0</a><br/>
 <a href="#10.1.0">10.1.0</a><br/>
 <a href="#10.0.0">10.0.0</a><br/>
@@ -28,6 +29,19 @@
   * [io.js](CHANGELOG_IOJS.md)
   * [Archive](CHANGELOG_ARCHIVE.md)
 
+<a id="10.2.1"></a>
+## 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)
+
 <a id="10.2.0"></a>
 ## 2018-05-23, Version 10.2.0 (Current), @MylesBorins