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/4c2f806e Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/4c2f806e Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/4c2f806e Branch: refs/heads/HDFS-10285 Commit: 4c2f806e056072acca9a26ee259f2bc4b90ddeda Parents: 0bdc60f Author: Rakesh Radhakrishnan <rake...@apache.org> Authored: Fri Jul 20 10:59:16 2018 +0530 Committer: Rakesh Radhakrishnan <rake...@apache.org> Committed: Tue Jul 31 12:11:09 2018 +0530 ---------------------------------------------------------------------- .../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/4c2f806e/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
