summaryrefslogtreecommitdiffstats
path: root/container-search/src/main/java/com/yahoo/search/Result.java
diff options
context:
space:
mode:
authorJon Bratseth <bratseth@verizonmedia.com>2020-02-26 16:32:06 +0100
committerJon Bratseth <bratseth@verizonmedia.com>2020-02-26 16:32:06 +0100
commit5168d102ca8c5d82c6f93753acc01cd2668d46a5 (patch)
tree8bef310c37d1508c5faecba3b4cf81d5d986e748 /container-search/src/main/java/com/yahoo/search/Result.java
parent2aa1ee8401290bfce3b97409e8fc634b8386f247 (diff)
Revert "Merge pull request #12351 from vespa-engine/revert-11875-bratseth/node-metrics"
This reverts commit 37f6c5b31cb2809a54c34dc3a4e51307f3320fbd, reversing changes made to 76221d0b9b7bda577ac61ce8a79c7b6ee3a8dbb4.
Diffstat (limited to 'container-search/src/main/java/com/yahoo/search/Result.java')
-rw-r--r--container-search/src/main/java/com/yahoo/search/Result.java1
1 files changed, 0 insertions, 1 deletions
diff --git a/container-search/src/main/java/com/yahoo/search/Result.java b/container-search/src/main/java/com/yahoo/search/Result.java
index 4080b09f40b..ab48d5797b2 100644
--- a/container-search/src/main/java/com/yahoo/search/Result.java
+++ b/container-search/src/main/java/com/yahoo/search/Result.java
@@ -89,7 +89,6 @@ public final class Result extends com.yahoo.processing.Response implements Clone
* with a result. It should <b>always</b> be called when adding
* hits from a result, but there is no constraints on the order of the calls.
*/
- @SuppressWarnings("deprecation")
public void mergeWith(Result result) {
totalHitCount += result.getTotalHitCount();
deepHitCount += result.getDeepHitCount();