mirror of
https://github.com/honeymoose/OpenSearch.git
synced 2025-03-09 14:34:43 +00:00
Conflicts: src/main/java/org/elasticsearch/action/bulk/BulkRequest.java src/main/java/org/elasticsearch/cluster/metadata/MetaDataIndexUpgradeService.java src/main/java/org/elasticsearch/node/internal/InternalSettingsPreparer.java src/test/java/org/elasticsearch/snapshots/DedicatedClusterSnapshotRestoreTests.java