Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/main' into windows-docker-inte…
Browse files Browse the repository at this point in the history
…gtest-jenkins-2
  • Loading branch information
peterzhuamazon committed Sep 15, 2023
2 parents 1310a80 + 57ea9d2 commit 39322c9
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
6 changes: 3 additions & 3 deletions manifests/2.10.0/opensearch-2.10.0.yml
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@ components:
- gradle:dependencies:opensearch.version
- name: alerting
repository: https://github.com/opensearch-project/alerting.git
ref: ab4cc0e6ce3195e4e48aef892c00e2b7345fe697
ref: a50fc55e9c42091186fe3fb0cab51a380206b6e2
platforms:
- linux
- windows
Expand All @@ -159,7 +159,7 @@ components:
- gradle:dependencies:opensearch.version: alerting
- name: security-analytics
repository: https://github.com/opensearch-project/security-analytics.git
ref: ae57d3a51923aa232fc04da2c6dd4e3592447091
ref: 1268aca36ca8ab55cd6a577842e6851dfb9983aa
platforms:
- linux
- windows
Expand All @@ -183,7 +183,7 @@ components:
- gradle:dependencies:opensearch.version
- name: custom-codecs
repository: https://github.com/opensearch-project/custom-codecs.git
ref: 196d5538d67732109479b4253469677e63f1bb8b
ref: 3437b438af35e93d321a232833f66e39131ff038
platforms:
- linux
- windows
Expand Down
2 changes: 1 addition & 1 deletion manifests/2.10.0/opensearch-dashboards-2.10.0.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ ci:
components:
- name: OpenSearch-Dashboards
repository: https://github.com/opensearch-project/OpenSearch-Dashboards.git
ref: a53e8a289a5dd9091d03f19470fd229b0fd16e16
ref: c1120d93e2ee647977f917a1249258a622d4eb5b
- name: functionalTestDashboards
repository: https://github.com/opensearch-project/opensearch-dashboards-functional-test.git
ref: '2.10'
Expand Down

0 comments on commit 39322c9

Please sign in to comment.