Skip to content

Commit

Permalink
Merge branch '1.3' into incr-1320
Browse files Browse the repository at this point in the history
Signed-off-by: Anan Zhuang <ananzh@amazon.com>
  • Loading branch information
ananzh authored Oct 31, 2024
2 parents 531391f + d0b47bd commit c9f6524
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 5 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ Inspired from [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
- [CVE-2024-29041] Bump express from 4.18.2 to 4.19.2 ([#7738](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/7738))
- [CVE-2024-33883] Bump ejs from 3.1.7 to 3.1.10 ([#7740](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/7740))
- [CVE-2024-37890] Bump ws from 6.2.2 to 6.2.3 and from 7.5.3 to 7.5.10 ([#7732](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/7732))
- [CVE-2017-16100] Use a patched version for the `dns-sync` dependency ([#7811](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/7811))

### 📈 Features/Enhancements

Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -191,7 +191,7 @@
"core-js": "^3.6.5",
"deep-freeze-strict": "^1.1.1",
"del": "^6.1.1",
"dns-sync": "^0.2.1",
"dns-sync": "npm:@amoo-miki/dns-sync@^0.2.1",
"elastic-apm-node": "^3.7.0",
"elasticsearch": "^16.7.0",
"execa": "^4.0.2",
Expand Down
8 changes: 4 additions & 4 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -7979,10 +7979,10 @@ dns-packet@^1.3.1:
ip "^1.1.0"
safe-buffer "^5.0.1"

dns-sync@^0.2.1:
version "0.2.1"
resolved "https://registry.yarnpkg.com/dns-sync/-/dns-sync-0.2.1.tgz#c519da400b90fa2e4a30a70030a1573330c72fa9"
integrity sha512-VB1pDSVs82kFsZuoHQ5/Ysx62WiIfDGn9sx/x55EoVyk8pLwdqWGB2XCaDDOusBllb+1y3XRijscFPJJfpbFiw==
"dns-sync@npm:@amoo-miki/dns-sync@^0.2.1":
version "0.2.2"
resolved "https://registry.yarnpkg.com/@amoo-miki/dns-sync/-/dns-sync-0.2.2.tgz#e713eb46c3ddf6fde37e9453a31a4440ca45a8e7"
integrity sha512-GoWRmng1RpnFXrfITbAgfndTjvBgf438jRq1Q5m1Db9HfN9qR/TlRRcl7LXsvq+oS3iUzXyNECzoU62jHPilKw==
dependencies:
debug "^4"
shelljs "~0.8"
Expand Down

0 comments on commit c9f6524

Please sign in to comment.