From 7aded71f3ab436519efa9b6c2071b3f748a45d54 Mon Sep 17 00:00:00 2001 From: Akira Ajisaka Date: Mon, 30 Mar 2015 11:25:35 +0900 Subject: [PATCH] HDFS-6408. Remove redundant definitions in log4j.properties. Contributed by Abhiraj Butala. (cherry picked from commit 232eca944a721c62f37e9012546a7fa814da6e01) --- hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt | 3 +++ .../contrib/bkjournal/src/test/resources/log4j.properties | 5 ----- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt index 1f2fcc8a605..4e93a1da58c 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt +++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt @@ -35,6 +35,9 @@ Release 2.8.0 - UNRELEASED HDFS-6263. Remove DRFA.MaxBackupIndex config from log4j.properties. (Abhiraj Butala via aajisaka) + HDFS-6408. Remove redundant definitions in log4j.properties. + (Abhiraj Butala via aajisaka) + OPTIMIZATIONS BUG FIXES diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/contrib/bkjournal/src/test/resources/log4j.properties b/hadoop-hdfs-project/hadoop-hdfs/src/contrib/bkjournal/src/test/resources/log4j.properties index f66c84ba77d..93c22f71496 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/contrib/bkjournal/src/test/resources/log4j.properties +++ b/hadoop-hdfs-project/hadoop-hdfs/src/contrib/bkjournal/src/test/resources/log4j.properties @@ -53,8 +53,3 @@ log4j.appender.ROLLINGFILE.layout.ConversionPattern=%d{ISO8601} - %-5p - [%t:%C{ # Max log file size of 10MB log4j.appender.ROLLINGFILE.MaxFileSize=10MB - -log4j.appender.ROLLINGFILE.layout=org.apache.log4j.PatternLayout -log4j.appender.ROLLINGFILE.layout.ConversionPattern=%d{ISO8601} - %-5p [%t:%C{1}@%L] - %m%n - -