From dfcb331ba3516264398121c9f23af3a79c0509cc Mon Sep 17 00:00:00 2001
From: Rakesh Radhakrishnan <rakeshr@apache.org>
Date: Fri, 20 Jul 2018 10:59:16 +0530
Subject: [PATCH] HDFS-13076: [SPS]: Addendum. Resolve conflicts after rebasing
 branch to trunk. Contributed by Rakesh R.

---
 .../java/org/apache/hadoop/hdfs/server/datanode/DataNode.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/DataNode.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/DataNode.java
index a7146023579..21af33f5d91 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/DataNode.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/DataNode.java
@@ -3624,8 +3624,8 @@ public class DataNode extends ReconfigurableBase
     }
     return this.diskBalancer;
   }
-}
 
   StoragePolicySatisfyWorker getStoragePolicySatisfyWorker() {
     return storagePolicySatisfyWorker;
-  }}
+  }
+}