Repository: hadoop Updated Branches: refs/heads/branch-2.8 e103acc8f -> 3ecc1431f
HDFS-12531. Fix conflict in the javadoc of UnderReplicatedBlocks.java in branch-2. Contributed by Bharat Viswanadham. (cherry picked from commit de5744c9035308654c7096bf5bd04e769a3a19e3) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/3ecc1431 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/3ecc1431 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/3ecc1431 Branch: refs/heads/branch-2.8 Commit: 3ecc1431fccc02eee3c834dc532bc5fb4167dc60 Parents: e103acc Author: Anu Engineer <[email protected]> Authored: Sat Sep 23 11:16:50 2017 -0700 Committer: Akira Ajisaka <[email protected]> Committed: Mon Sep 25 13:12:27 2017 +0900 ---------------------------------------------------------------------- .../hdfs/server/blockmanagement/UnderReplicatedBlocks.java | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/3ecc1431/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/UnderReplicatedBlocks.java ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/UnderReplicatedBlocks.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/UnderReplicatedBlocks.java index cd559a7..4c2bbfc 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/UnderReplicatedBlocks.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/UnderReplicatedBlocks.java @@ -36,11 +36,7 @@ import org.apache.hadoop.hdfs.util.LightWeightLinkedSet; * * <p/> * The policy for choosing which priority to give added blocks -<<<<<<< HEAD - * is implemented in {@link #getPriority(int, int, int)}. -======= - * is implemented in {@link #getPriority(BlockInfo, int, int, int, int)}. ->>>>>>> 5411dc5... HDFS-9205. Do not schedule corrupt blocks for replication. (szetszwo) + * is implemented in {@link #getPriority(int, int, int, int)}. * </p> * <p>The queue order is as follows:</p> * <ol> --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
