Skip to content

Commit 7d02b34

Browse files
authored
Merge branch 'opensearch-project:main' into ssdv_nextord_17628
2 parents 4d6126e + 399188f commit 7d02b34

File tree

21 files changed

+8
-4272
lines changed

21 files changed

+8
-4272
lines changed

.github/workflows/gradle-check.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ jobs:
103103
run: |
104104
set -e
105105
set -o pipefail
106-
bash opensearch-build/scripts/gradle/gradle-check.sh ${{ secrets.JENKINS_GRADLE_CHECK_GENERIC_WEBHOOK_TOKEN }} | tee -a gradle-check.log
106+
bash opensearch-build/scripts/gradle/gradle-check.sh -t ${{ secrets.JENKINS_GRADLE_CHECK_GENERIC_WEBHOOK_TOKEN }} -u ${{ secrets.JENKINS_GITHUB_USER}} -p ${{ secrets.JENKINS_GITHUB_USER_TOKEN}} | tee -a gradle-check.log
107107
108108
- name: Setup Result Status
109109
if: always()

CHANGELOG.md

-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
1111
- Introduce a new search node role to hold search only shards ([#17620](https://github.com/opensearch-project/OpenSearch/pull/17620))
1212
- Fix systemd integTest on deb regarding path ownership check ([#17641](https://github.com/opensearch-project/OpenSearch/pull/17641))
1313
- Add dfs transformation function in XContentMapValues ([#17612](https://github.com/opensearch-project/OpenSearch/pull/17612))
14-
- [Security Manager Replacement] Add support of Java policies ([#17663](https://github.com/opensearch-project/OpenSearch/pull/17663))
1514
- Added Kinesis support as a plugin for the pull-based ingestion ([#17615](https://github.com/opensearch-project/OpenSearch/pull/17615)
1615

1716
### Changed

gradle/missing-javadoc.gradle

-1
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,6 @@ configure([
106106
project(":libs:opensearch-secure-sm"),
107107
project(":libs:opensearch-ssl-config"),
108108
project(":libs:opensearch-x-content"),
109-
project(":libs:agent-sm:agent-policy"),
110109
project(":modules:aggs-matrix-stats"),
111110
project(":modules:analysis-common"),
112111
project(":modules:geo"),

libs/agent-sm/agent-policy/build.gradle

-27
This file was deleted.

libs/agent-sm/agent-policy/src/main/java/org/opensearch/package-info.java

-12
This file was deleted.

0 commit comments

Comments
 (0)