rebase with upstream main

Signed-off-by: Kaushal Kumar <[email protected]>
opensearch-project · Oct 6, 2023 · 906bd8f · 906bd8f
1 parent ad38885
commit 906bd8f
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/server/src/main/java/org/opensearch/search/backpressure/stats/SearchShardTaskStats.java b/server/src/main/java/org/opensearch/search/backpressure/stats/SearchShardTaskStats.java
@@ -103,11 +103,7 @@ public boolean equals(Object o) {
         SearchShardTaskStats that = (SearchShardTaskStats) o;
         return cancellationCount == that.cancellationCount
             && limitReachedCount == that.limitReachedCount
-<<<<<<< HEAD
-            && completionCount == completionCount
-=======
             && completionCount == that.completionCount
->>>>>>> 3324fa1aaea (add taskCompletionCount in search_backpressure)
             && resourceUsageTrackerStats.equals(that.resourceUsageTrackerStats);
     }