Skip to content

Commit

Permalink
Merge branch 'v16.x-staging' of https://github.com/nodejs/node into d…
Browse files Browse the repository at this point in the history
…eps/update-openssl-to-openssl1.1.1n-v16.x
  • Loading branch information
hassaanp committed Mar 16, 2022
2 parents 9341c46 + e10e4fd commit 0940cf4
Show file tree
Hide file tree
Showing 6 changed files with 227 additions and 45 deletions.
3 changes: 2 additions & 1 deletion CHANGELOG.md
Expand Up @@ -33,7 +33,8 @@ release.
</tr>
<tr>
<td valign="top">
<b><a href="doc/changelogs/CHANGELOG_V16.md#16.14.0">16.14.0</a></b><br/>
<b><a href="doc/changelogs/CHANGELOG_V16.md#16.14.1">16.14.1</a></b><br/>
<a href="doc/changelogs/CHANGELOG_V16.md#16.14.0">16.14.0</a><br/>
<a href="doc/changelogs/CHANGELOG_V16.md#16.13.2">16.13.2</a><br/>
<a href="doc/changelogs/CHANGELOG_V16.md#16.13.1">16.13.1</a><br/>
<a href="doc/changelogs/CHANGELOG_V16.md#16.13.0">16.13.0</a><br/>
Expand Down
4 changes: 2 additions & 2 deletions doc/api/crypto.md
Expand Up @@ -2472,7 +2472,7 @@ added: v15.6.0
<!-- YAML
added: v15.6.0
changes:
- version: REPLACEME
- version: v16.14.1
pr-url: https://github.com/nodejs/node/pull/41599
description: The `wildcards`, `partialWildcards`, `multiLabelWildcards`, and
`singleLabelSubdomains` options have been removed since they
Expand Down Expand Up @@ -2516,7 +2516,7 @@ from the given `name` in capitalization.
<!-- YAML
added: v15.6.0
changes:
- version: REPLACEME
- version: v16.14.1
pr-url: https://github.com/nodejs/node/pull/41571
description: The `options` argument has been removed since it had no effect.
-->
Expand Down

0 comments on commit 0940cf4

Please sign in to comment.