Revert "Bratseth/node metrics"

2 files changed, 6 insertions, 6 deletions

diff --git a/container-search/src/main/java/com/yahoo/search/federation/FederationResult.java b/container-search/src/main/java/com/yahoo/search/federation/FederationResult.java
index 6243dc694c2..5f1cfccf549 100644
--- a/container-search/src/main/java/com/yahoo/search/federation/FederationResult.java
+++ b/container-search/src/main/java/com/yahoo/search/federation/FederationResult.java
@@ -39,8 +39,8 @@ class FederationResult {
     }
 
     /**
-     * Wait on each target for that targets timeout.
-     * In the worst case this is the same as waiting for the max target timeout,
+     * Wait on each target for that targets timeout
+     * On the worst case this is the same as waiting for the max target timeout,
      * in the average case it may be much better because lower timeout sources do not get to
      * drive the timeout above their own timeout value.
      * When this completes, results can be accessed from the TargetResults with no blocking
diff --git a/container-search/src/main/java/com/yahoo/search/federation/FederationSearcher.java b/container-search/src/main/java/com/yahoo/search/federation/FederationSearcher.java
index 60c5d42c531..421544b5b49 100644
--- a/container-search/src/main/java/com/yahoo/search/federation/FederationSearcher.java
+++ b/container-search/src/main/java/com/yahoo/search/federation/FederationSearcher.java
@@ -354,7 +354,7 @@ public class FederationSearcher extends ForkingSearcher {
     }
 
     private void warnIfUnresolvedSearchChains(List<UnresolvedSearchChainException> missingTargets,
-                                              HitGroup errorHitGroup) {
+                                      HitGroup errorHitGroup) {
         if (!missingTargets.isEmpty()) {
             errorHitGroup.addError(missingSearchChainsErrorMessage(missingTargets));
         }
@@ -492,9 +492,9 @@ public class FederationSearcher extends ForkingSearcher {
      * TODO This is probably a dirty hack for bug 4711376. There are probably better ways.
      * But I will leave that to trd-processing@
      *
-     * @param group the merging hitgroup to be updated if necessary
-     * @param orderer the per provider hit orderer
-     * @return he hitorderer chosen
+     * @param group  The merging hitgroup to be updated if necessary
+     * @param orderer The per provider hit orderer.
+     * @return The hitorderer chosen
      */
     private HitOrderer dirtyCopyIfModifiedOrderer(HitGroup group, HitOrderer orderer) {
         if (orderer != null) {