From 3f466d89014a79fa553709cbc15a169926be6617 Mon Sep 17 00:00:00 2001
From: Stewart X Addison <sxa@redhat.com>
Date: Thu, 10 Mar 2022 15:15:36 +0000
Subject: [PATCH] 2022-03-10, Version 17.7.1 (Current)

Notable changes:

Fixed regression in url.resolve()

This release fixes an issue introduced in Node.js v17.7.0 with some URLs
that contain `@`. This issue affected yarn 1. This version reverts the
change that introduced the regression.

PR-URL: https://github.com/nodejs/node/pull/42285
---
 CHANGELOG.md                    |  3 ++-
 doc/changelogs/CHANGELOG_V17.md | 17 +++++++++++++++++
 2 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 56efa7bff0f30e..be205b173bac5c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -33,7 +33,8 @@ release.
 </tr>
 <tr>
   <td valign="top">
-<b><a href="doc/changelogs/CHANGELOG_V17.md#17.7.0">17.7.0</a></b><br/>
+<b><a href="doc/changelogs/CHANGELOG_V17.md#17.7.1">17.7.1</a></b><br/>
+<a href="doc/changelogs/CHANGELOG_V17.md#17.7.0">17.7.0</a><br/>
 <a href="doc/changelogs/CHANGELOG_V17.md#17.6.0">17.6.0</a><br/>
 <a href="doc/changelogs/CHANGELOG_V17.md#17.5.0">17.5.0</a><br/>
 <a href="doc/changelogs/CHANGELOG_V17.md#17.4.0">17.4.0</a><br/>
diff --git a/doc/changelogs/CHANGELOG_V17.md b/doc/changelogs/CHANGELOG_V17.md
index a0d26d64a25990..142fe3b5c3534c 100644
--- a/doc/changelogs/CHANGELOG_V17.md
+++ b/doc/changelogs/CHANGELOG_V17.md
@@ -8,6 +8,7 @@
 </tr>
 <tr>
 <td>
+<a href="#17.7.1">17.7.1</a><br/>
 <a href="#17.7.0">17.7.0</a><br/>
 <a href="#17.6.0">17.6.0</a><br/>
 <a href="#17.5.0">17.5.0</a><br/>
@@ -41,6 +42,22 @@
   * [io.js](CHANGELOG_IOJS.md)
   * [Archive](CHANGELOG_ARCHIVE.md)
 
+<a id="17.7.1"></a>
+
+## 2022-03-10, Version 17.7.1 (Current), @BethGriggs prepared by @sxa
+
+### Notable Changes
+
+#### Fixed regression in url.resolve()
+
+This release fixes an issue introduced in Node.js v17.7.0 with some URLs
+that contain `@`. This issue affected yarn 1. This version reverts the
+change that introduced the regression.
+
+### Commits
+
+* \[[`96a9e00fb3`](https://github.com/nodejs/node/commit/96a9e00fb3)] - **url**: revert fix url.parse() for `@hostname` (Antoine du Hamel) [#42280](https://github.com/nodejs/node/pull/42280)
+
 <a id="17.7.0"></a>
 
 ## 2022-03-09, Version 17.7.0 (Current), @BethGriggs prepared by @sxa