Skip to content

Commit 04975a0

Browse files
authored
Merge branch 'main' into add_skip_factor
Signed-off-by: kkewwei <kewei.11@bytedance.com>
2 parents 628d631 + 54b8f05 commit 04975a0

File tree

25 files changed

+869
-483
lines changed

25 files changed

+869
-483
lines changed

CHANGELOG.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
1717
- Add BooleanQuery rewrite moving constant-scoring must clauses to filter clauses ([#18510](https://github.com/opensearch-project/OpenSearch/issues/18510))
1818
- Add functionality for plugins to inject QueryCollectorContext during QueryPhase ([#18637](https://github.com/opensearch-project/OpenSearch/pull/18637))
1919
- Add support for non-timing info in profiler ([#18460](https://github.com/opensearch-project/OpenSearch/issues/18460))
20+
- Extend Approximation Framework to other numeric types ([#18530](https://github.com/opensearch-project/OpenSearch/issues/18530))
2021
- Add a dynamic setting to change skip_cache_factor and min_frequency for querycache ([#18351](https://github.com/opensearch-project/OpenSearch/issues/18351))
2122

2223
### Changed
@@ -33,6 +34,11 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
3334
- Bump `com.azure:azure-core-http-netty` from 1.15.11 to 1.15.12 ([#18586](https://github.com/opensearch-project/OpenSearch/pull/18586))
3435
- Bump `com.squareup.okio:okio` from 3.13.0 to 3.14.0 ([#18645](https://github.com/opensearch-project/OpenSearch/pull/18645))
3536
- Bump `com.netflix.nebula.ospackage-base` from 11.11.2 to 12.0.0 ([#18646](https://github.com/opensearch-project/OpenSearch/pull/18646))
37+
- Bump `com.azure:azure-storage-blob` from 12.30.0 to 12.30.1 ([#18644](https://github.com/opensearch-project/OpenSearch/pull/18644))
38+
- Bump `org.bouncycastle:bctls-fips` from 2.0.19 to 2.0.20 ([#18668](https://github.com/opensearch-project/OpenSearch/pull/18668))
39+
- Bump `org.bouncycastle:bcpkix-fips` from 2.0.7 to 2.0.8 ([#18668](https://github.com/opensearch-project/OpenSearch/pull/18668))
40+
- Bump `org.bouncycastle:bcpg-fips` from 2.0.10 to 2.0.11 ([#18668](https://github.com/opensearch-project/OpenSearch/pull/18668))
41+
- Bump `com.password4j:password4j` from 1.8.2 to 1.8.3 ([#18668](https://github.com/opensearch-project/OpenSearch/pull/18668))
3642

3743
### Deprecated
3844

client/rest/licenses/bctls-fips-2.0.19.jar.sha1

Lines changed: 0 additions & 1 deletion
This file was deleted.
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
1138f7896e0d1bb0d924bc868ed2dfda4f69470e

distribution/tools/plugin-cli/licenses/bcpg-fips-2.0.10.jar.sha1

Lines changed: 0 additions & 1 deletion
This file was deleted.
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
19f38a0d8048e87039b1bb6c1ba4d2b104891d04

gradle/libs.versions.toml

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -62,11 +62,12 @@ hadoop3 = "3.3.6"
6262
# - plugins/ingest-attachment (transitive dependency, check the upstream POM)
6363
# - distribution/tools/plugin-cli
6464
bouncycastle_jce = "2.0.0"
65-
bouncycastle_tls = "2.0.19"
66-
bouncycastle_pkix = "2.0.7"
67-
bouncycastle_pg = "2.0.10"
65+
bouncycastle_tls = "2.0.20"
66+
bouncycastle_pkix = "2.0.8"
67+
bouncycastle_pg = "2.0.11"
6868
bouncycastle_util = "2.0.3"
69-
password4j = "1.8.2"
69+
password4j = "1.8.3"
70+
7071
# test dependencies
7172
randomizedrunner = "2.7.1"
7273
junit = "4.13.2"

libs/ssl-config/licenses/bcpkix-fips-2.0.7.jar.sha1

Lines changed: 0 additions & 1 deletion
This file was deleted.
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
aad7b0fcf55892e7ff7e2d23a290f143f4bb56e0

libs/ssl-config/licenses/bctls-fips-2.0.19.jar.sha1

Lines changed: 0 additions & 1 deletion
This file was deleted.
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
1138f7896e0d1bb0d924bc868ed2dfda4f69470e

0 commit comments

Comments
 (0)