Skip to content

Commit

Permalink
Merge branch '2.x' into backport-15072
Browse files Browse the repository at this point in the history
Signed-off-by: Jay Deng <[email protected]>
  • Loading branch information
jed326 authored Aug 2, 2024
2 parents 8aa8fcd + e03e093 commit 0e04531
Show file tree
Hide file tree
Showing 92 changed files with 439 additions and 55 deletions.
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,10 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
- Add ThreadContextPermission for markAsSystemContext and allow core to perform the method ([#15016](https://github.com/opensearch-project/OpenSearch/pull/15016))
- Add ThreadContextPermission for stashAndMergeHeaders and stashWithOrigin ([#15039](https://github.com/opensearch-project/OpenSearch/pull/15039))
- [Concurrent Segment Search] Support composite aggregations with scripting ([#15072](https://github.com/opensearch-project/OpenSearch/pull/15072))
- Add `rangeQuery` and `regexpQuery` for `constant_keyword` field type ([#14711](https://github.com/opensearch-project/OpenSearch/pull/14711))

### Dependencies
- Bump `netty` from 4.1.111.Final to 4.1.112.Final ([#15081](https://github.com/opensearch-project/OpenSearch/pull/15081))
- Bump `org.apache.commons:commons-lang3` from 3.14.0 to 3.15.0 ([#14861](https://github.com/opensearch-project/OpenSearch/pull/14861))
- OpenJDK Update (July 2024 Patch releases) ([#14998](https://github.com/opensearch-project/OpenSearch/pull/14998))
- Bump `com.microsoft.azure:msal4j` from 1.16.1 to 1.16.2 ([#14995](https://github.com/opensearch-project/OpenSearch/pull/14995))
Expand Down
2 changes: 1 addition & 1 deletion buildSrc/version.properties
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ hdrhistogram = 2.2.2
# when updating the JNA version, also update the version in buildSrc/build.gradle
jna = 5.13.0

netty = 4.1.111.Final
netty = 4.1.112.Final
joda = 2.12.7

# project reactor
Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
bdc12df04bb6858890b8aa108060b5b365a26102

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
c87f2ec3d9a97bd2b793d16817abb2bab93a7fc3

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
81af1040bfa977f98dd0e1bd9639513ea862ca04

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
b2798069092a981a832b7510d0462ee9efb7a80e

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
3d5e2d5bcc6baeeb8c13a230980c6132a778e036

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
58a631d9d44c4ed7cc0dcc9cffa6641da9374d72

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
77cd136dd3843f5e7cbcf68c824975d745c49ddb

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
b50ff619cdcdc48e748cba3405c9988529f28f60

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
06724b184ee870ecc4d8fc36931beeb3c387b0ee

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
7fa28b510f0f16f4d5d7188b86bef59e048f62f9

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
9aed7e78c467d06a47a45b5b27466380a6427e2f

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
b23c87a85451b3b0e7c3e8e89698cea6831a8418

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
375872f1c16bb51aac016ff6ee4f5d28b1288d4d

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
b50ff619cdcdc48e748cba3405c9988529f28f60

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
d6b2e543749a86957777a46cf68aaa337cc558cb

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
bdc12df04bb6858890b8aa108060b5b365a26102

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
c87f2ec3d9a97bd2b793d16817abb2bab93a7fc3

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
81af1040bfa977f98dd0e1bd9639513ea862ca04

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
7fa28b510f0f16f4d5d7188b86bef59e048f62f9

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
b2798069092a981a832b7510d0462ee9efb7a80e

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
3d5e2d5bcc6baeeb8c13a230980c6132a778e036

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
58a631d9d44c4ed7cc0dcc9cffa6641da9374d72

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
77cd136dd3843f5e7cbcf68c824975d745c49ddb

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
67e590356eb53c20aaabd67f61ae66f628e62e3d

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
b50ff619cdcdc48e748cba3405c9988529f28f60

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
bdc12df04bb6858890b8aa108060b5b365a26102

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
c87f2ec3d9a97bd2b793d16817abb2bab93a7fc3

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
81af1040bfa977f98dd0e1bd9639513ea862ca04

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
b2798069092a981a832b7510d0462ee9efb7a80e

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
3d5e2d5bcc6baeeb8c13a230980c6132a778e036

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
58a631d9d44c4ed7cc0dcc9cffa6641da9374d72

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
77cd136dd3843f5e7cbcf68c824975d745c49ddb

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
bdc12df04bb6858890b8aa108060b5b365a26102

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
c87f2ec3d9a97bd2b793d16817abb2bab93a7fc3

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
06724b184ee870ecc4d8fc36931beeb3c387b0ee

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
81af1040bfa977f98dd0e1bd9639513ea862ca04

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
7fa28b510f0f16f4d5d7188b86bef59e048f62f9

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
b2798069092a981a832b7510d0462ee9efb7a80e

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
3d5e2d5bcc6baeeb8c13a230980c6132a778e036

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
58a631d9d44c4ed7cc0dcc9cffa6641da9374d72

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
375872f1c16bb51aac016ff6ee4f5d28b1288d4d

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
77cd136dd3843f5e7cbcf68c824975d745c49ddb

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
b50ff619cdcdc48e748cba3405c9988529f28f60
Loading

0 comments on commit 0e04531

Please sign in to comment.