Merge remote-tracking branch 'origin/async-bug-branch#13702' into asy… · SwethaGuptha/OpenSearch@6c0542f · GitHub

Commit

Merge remote-tracking branch 'origin/async-bug-branch#13702' into asy…

Browse files

…nc-bug-branch#13702

# Conflicts:
#	server/src/main/java/org/opensearch/gateway/PrimaryShardBatchAllocator.java
#	server/src/main/java/org/opensearch/gateway/ReplicaShardBatchAllocator.java

Loading branch information

Swetha Guptha committed Jun 6, 2024

2 parents 191f324 + ce7373d commit 6c0542f