Skip to content

Commit 0940cf4

Browse files
committed
Merge branch 'v16.x-staging' of https://github.com/nodejs/node into deps/update-openssl-to-openssl1.1.1n-v16.x
2 parents 9341c46 + e10e4fd commit 0940cf4

File tree

6 files changed

+227
-45
lines changed

6 files changed

+227
-45
lines changed

CHANGELOG.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,8 @@ release.
3333
</tr>
3434
<tr>
3535
<td valign="top">
36-
<b><a href="doc/changelogs/CHANGELOG_V16.md#16.14.0">16.14.0</a></b><br/>
36+
<b><a href="doc/changelogs/CHANGELOG_V16.md#16.14.1">16.14.1</a></b><br/>
37+
<a href="doc/changelogs/CHANGELOG_V16.md#16.14.0">16.14.0</a><br/>
3738
<a href="doc/changelogs/CHANGELOG_V16.md#16.13.2">16.13.2</a><br/>
3839
<a href="doc/changelogs/CHANGELOG_V16.md#16.13.1">16.13.1</a><br/>
3940
<a href="doc/changelogs/CHANGELOG_V16.md#16.13.0">16.13.0</a><br/>

doc/api/crypto.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2472,7 +2472,7 @@ added: v15.6.0
24722472
<!-- YAML
24732473
added: v15.6.0
24742474
changes:
2475-
- version: REPLACEME
2475+
- version: v16.14.1
24762476
pr-url: https://github.com/nodejs/node/pull/41599
24772477
description: The `wildcards`, `partialWildcards`, `multiLabelWildcards`, and
24782478
`singleLabelSubdomains` options have been removed since they
@@ -2516,7 +2516,7 @@ from the given `name` in capitalization.
25162516
<!-- YAML
25172517
added: v15.6.0
25182518
changes:
2519-
- version: REPLACEME
2519+
- version: v16.14.1
25202520
pr-url: https://github.com/nodejs/node/pull/41571
25212521
description: The `options` argument has been removed since it had no effect.
25222522
-->

0 commit comments

Comments
 (0)