HDFS-13076: [SPS]: Addendum. Resolve conflicts after rebasing branch to trunk. Contributed by Rakesh R.
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/dfcb331b Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/dfcb331b Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/dfcb331b Branch: refs/heads/HDFS-10285 Commit: dfcb331ba3516264398121c9f23af3a79c0509cc Parents: db3f227 Author: Rakesh Radhakrishnan <rake...@apache.org> Authored: Fri Jul 20 10:59:16 2018 +0530 Committer: Uma Maheswara Rao Gangumalla <umamah...@apache.org> Committed: Sun Aug 12 03:06:06 2018 -0700 ---------------------------------------------------------------------- .../java/org/apache/hadoop/hdfs/server/datanode/DataNode.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/dfcb331b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/DataNode.java ---------------------------------------------------------------------- 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 a714602..21af33f 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; - }} + } +} --------------------------------------------------------------------- To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org For additional commands, e-mail: common-commits-h...@hadoop.apache.org
