#4971 Resolving merge conflicts.

Signed-off-by: jzonthemtn <[email protected]>
opensearch-project · Oct 2, 2024 · 8f93e45 · 8f93e45
2 parents 3e5f0f6 + 00a7599
commit 8f93e45
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/manifests/3.0.0/opensearch-3.0.0.yml b/manifests/3.0.0/opensearch-3.0.0.yml
@@ -243,4 +243,4 @@ components:
     ref: main
     platforms:
       - linux
-      - windows
+      - windows
diff --git a/tools/vulnerability-scan/wss-scan.config b/tools/vulnerability-scan/wss-scan.config
@@ -1,3 +1,3 @@
 baseDirPath=$(pwd)
 gitBasePath=https://github.com/opensearch-project/
-gitRepos=OpenSearch,OpenSearch-Dashboards,alerting,alerting-dashboards-plugin,anomaly-detection,anomaly-detection-dashboards-plugin,asynchronous-search,common-utils,cross-cluster-replication,dashboards-reports,dashboards-visualizations,data-prepper,index-management,index-management-dashboards-plugin,job-scheduler,k-NN,opensearch-java,opensearch-js,opensearch-py,opensearch-dsl-py,performance-analyzer,performance-analyzer-rca,perftop,security,security-dashboards-plugin,sql,observability,opensearch-build,ml-commons,notifications,geospatial,dashboards-maps,neural-search,security-analytics,security-analytics-dashboards-plugin,dashboards-search-relevance,opensearch-migrations,sql-jdbc,sql-odbc,sql-cli,dashboards-query-workbench,dashboards-observability,dashboards-reporting,dashboards-notifications,opensearch-ai-flow-dashboards,dashboards-assistant,query-insights,dashboards-flow-framework,opensearch-system-templates,foundation-website,automation-app,user-behavior-insights
+gitRepos=OpenSearch,OpenSearch-Dashboards,alerting,alerting-dashboards-plugin,anomaly-detection,anomaly-detection-dashboards-plugin,asynchronous-search,common-utils,cross-cluster-replication,dashboards-reports,dashboards-visualizations,data-prepper,index-management,index-management-dashboards-plugin,job-scheduler,k-NN,opensearch-java,opensearch-js,opensearch-py,opensearch-dsl-py,performance-analyzer,performance-analyzer-rca,perftop,security,security-dashboards-plugin,sql,observability,opensearch-build,ml-commons,notifications,geospatial,dashboards-maps,neural-search,security-analytics,security-analytics-dashboards-plugin,dashboards-search-relevance,opensearch-migrations,sql-jdbc,sql-odbc,sql-cli,dashboards-query-workbench,dashboards-observability,dashboards-reporting,dashboards-notifications,opensearch-ai-flow-dashboards,dashboards-assistant,query-insights,dashboards-flow-framework,opensearch-system-templates,foundation-website,automation-app,user-behavior-insights
-Original file line number
+Diff line change
@@ Expand Up / @@ -243,4 +243,4 @@ components: @@
         ref: main
         platforms:
           - linux
-          - windows
+          - windows