You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by ae...@apache.org on 2017/09/23 18:19:31 UTC
hadoop git commit: HDFS-12531. Fix conflict in the javadoc of
UnderReplicatedBlocks.java in branch-2. Contributed by Bharat Viswanadham.
Repository: hadoop
Updated Branches:
refs/heads/branch-2 d0c0bd573 -> de5744c90
HDFS-12531. Fix conflict in the javadoc of UnderReplicatedBlocks.java in branch-2. Contributed by Bharat Viswanadham.
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/de5744c9
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/de5744c9
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/de5744c9
Branch: refs/heads/branch-2
Commit: de5744c9035308654c7096bf5bd04e769a3a19e3
Parents: d0c0bd5
Author: Anu Engineer <ae...@apache.org>
Authored: Sat Sep 23 11:16:50 2017 -0700
Committer: Anu Engineer <ae...@apache.org>
Committed: Sat Sep 23 11:16:50 2017 -0700
----------------------------------------------------------------------
.../hdfs/server/blockmanagement/UnderReplicatedBlocks.java | 6 +-----
1 file changed, 1 insertion(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/de5744c9/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: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org