Uploaded image for project: 'Hadoop HDFS'
  1. Hadoop HDFS
  2. HDFS-12531

Fix conflict in the javadoc of UnderReplicatedBlocks.java in branch-2

    Details

    • 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:
    • Target Version/s:
    • Hadoop Flags:
      Reviewed

      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>
      

        Attachments

          Issue Links

            Activity

              People

              • Assignee:
                bharatviswa Bharat Viswanadham
                Reporter:
                ajisakaa Akira Ajisaka
              • Votes:
                0 Vote for this issue
                Watchers:
                3 Start watching this issue

                Dates

                • Created:
                  Updated:
                  Resolved: