Apache
/
hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HDFS-12531. Fix conflict in the javadoc of UnderReplicatedBlocks.java in branch-2. Contributed by Bharat Viswanadham.

This commit is contained in:
Anu Engineer 2017-09-23 11:16:50 -07:00
parent d0c0bd573b
commit de5744c903
1 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/UnderReplicatedBlocks.java
View File

@ -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>