Repository: hadoop Updated Branches: refs/heads/branch-2 a79a38d09 -> 7aded71f3
HDFS-6408. Remove redundant definitions in log4j.properties. Contributed by Abhiraj Butala. (cherry picked from commit 232eca944a721c62f37e9012546a7fa814da6e01) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/7aded71f Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/7aded71f Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/7aded71f Branch: refs/heads/branch-2 Commit: 7aded71f3ab436519efa9b6c2071b3f748a45d54 Parents: a79a38d Author: Akira Ajisaka <[email protected]> Authored: Mon Mar 30 11:25:35 2015 +0900 Committer: Akira Ajisaka <[email protected]> Committed: Mon Mar 30 11:26:11 2015 +0900 ---------------------------------------------------------------------- hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt | 3 +++ .../src/contrib/bkjournal/src/test/resources/log4j.properties | 5 ----- 2 files changed, 3 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/7aded71f/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt index 1f2fcc8..4e93a1d 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 http://git-wip-us.apache.org/repos/asf/hadoop/blob/7aded71f/hadoop-hdfs-project/hadoop-hdfs/src/contrib/bkjournal/src/test/resources/log4j.properties ---------------------------------------------------------------------- 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 f66c84b..93c22f7 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 - -
