[HDFS-12531] Fix conflict in the javadoc of UnderReplicatedBlocks.java in branch-2

• Type: Bug
• Status: Resolved
• Priority: Minor
• Resolution: Fixed
• Affects Version/s: 2.8.0
• Fix Version/s: 2.9.0, 2.8.3
• Component/s: documentation
• Labels: newbie
• Target Version/s: 2.9.0, 2.8.3
• Hadoop Flags: Reviewed
• Assignee: Bharat Viswanadham
• Reporter: Akira Ajisaka
• Created: 22/Sep/17 02:38
• Updated: 25/Sep/17 04:14
• Resolved: 23/Sep/17 18:20

Description

In HDFS-9205, the following was pushed without fixing conflicts.

 * <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)
 * </p>

Issue Links

• is broken by: HDFS-9205 Do not schedule corrupt blocks for replication