[
https://issues.apache.org/jira/browse/HDFS-12531?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
]
Work on HDFS-12531 started by Bharat Viswanadham.
-------------------------------------------------
> Fix conflict in the javadoc of UnderReplicatedBlocks.java in branch-2
> ---------------------------------------------------------------------
>
> Key: HDFS-12531
> URL: https://issues.apache.org/jira/browse/HDFS-12531
> Project: Hadoop HDFS
> Issue Type: Bug
> Components: documentation
> Affects Versions: 2.8.0
> Reporter: Akira Ajisaka
> Assignee: Bharat Viswanadham
> Priority: Minor
> Labels: newbie
> Attachments: HDFS-12531.01.patch
>
>
> In HDFS-9205, the following was pushed without fixing conflicts.
> {noformat}
> * <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>
> {noformat}
--
This message was sent by Atlassian JIRA
(v6.4.14#64029)
---------------------------------------------------------------------
To unsubscribe, e-mail: hdfs-issues-unsubscr...@hadoop.apache.org
For additional commands, e-mail: hdfs-issues-h...@hadoop.apache.org
