Repository: hadoop Updated Branches: refs/heads/branch-2 af70fc42e -> 09a613b02
HDFS-10410. RedundantEditLogInputStream.LOG is set to wrong class. (John Zhuge via lei) (cherry picked from commit 6a6e74acf5c38a4995c4622148721cfe2f1fbdad) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/09a613b0 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/09a613b0 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/09a613b0 Branch: refs/heads/branch-2 Commit: 09a613b0235639888e671a6b991a5d18072e8018 Parents: af70fc4 Author: Lei Xu <l...@apache.org> Authored: Mon May 16 17:05:46 2016 -0700 Committer: Lei Xu <l...@apache.org> Committed: Mon May 16 17:07:03 2016 -0700 ---------------------------------------------------------------------- .../hadoop/hdfs/server/namenode/RedundantEditLogInputStream.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/09a613b0/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/RedundantEditLogInputStream.java ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/RedundantEditLogInputStream.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/RedundantEditLogInputStream.java index 33be8b0..a73206b 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/RedundantEditLogInputStream.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/RedundantEditLogInputStream.java @@ -37,7 +37,8 @@ import com.google.common.primitives.Longs; * different subset of the available edits. */ class RedundantEditLogInputStream extends EditLogInputStream { - public static final Log LOG = LogFactory.getLog(EditLogInputStream.class.getName()); + public static final Log LOG = LogFactory.getLog( + RedundantEditLogInputStream.class.getName()); private int curIdx; private long prevTxId; private final EditLogInputStream[] streams; --------------------------------------------------------------------- To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org For additional commands, e-mail: common-commits-h...@hadoop.apache.org