HDFS-13076: [SPS]: Addendum. Resolve conflicts after rebasing branch to trunk. Contributed by Rakesh R.

2018-07-20 10:59:16 +05:30 · 2018-07-20 10:59:16 +05:30 · dfcb331ba3
parent db3f227d8a
commit dfcb331ba3
1 changed files with 2 additions and 2 deletions
--- 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;
-  }}
+  }
+}