Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/nodejs/node.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMyles Borins <mylesborins@google.com>2018-05-24 20:31:04 +0300
committerMyles Borins <mylesborins@google.com>2018-05-24 20:38:46 +0300
commit65d13beb330df00065a1ee07954cb26959147af4 (patch)
tree2b5989e442d2fe3959c108d4cb2c76f34a8de4b2
parent2a9c83321b7893395d9472755290c31acf4228a4 (diff)
2018-05-24, Version 10.2.1 (Current)v10.2.1
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
-rw-r--r--CHANGELOG.md3
-rw-r--r--doc/changelogs/CHANGELOG_V10.md14
2 files changed, 16 insertions, 1 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8ddad5af9fb..8c346784df1 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