Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id C607F200D0C for ; Wed, 20 Sep 2017 14:09:00 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id C48EA1609E2; Wed, 20 Sep 2017 12:09:00 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 10CBF1609E1 for ; Wed, 20 Sep 2017 14:08:59 +0200 (CEST) Received: (qmail 43644 invoked by uid 500); 20 Sep 2017 12:08:59 -0000 Mailing-List: contact common-commits-help@hadoop.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Delivered-To: mailing list common-commits@hadoop.apache.org Received: (qmail 43635 invoked by uid 99); 20 Sep 2017 12:08:59 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 20 Sep 2017 12:08:59 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id E345FE08F0; Wed, 20 Sep 2017 12:08:58 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: aajisaka@apache.org To: common-commits@hadoop.apache.org Message-Id: <92a7b457001e4968863abfc413c0edea@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: hadoop git commit: HADOOP-7308. Remove unused TaskLogAppender configurations from log4j.properties. Contributed by Todd Lipcon and J.Andreina. Date: Wed, 20 Sep 2017 12:08:58 +0000 (UTC) archived-at: Wed, 20 Sep 2017 12:09:01 -0000 Repository: hadoop Updated Branches: refs/heads/branch-2 bdd8433d4 -> 6581f2dea HADOOP-7308. Remove unused TaskLogAppender configurations from log4j.properties. Contributed by Todd Lipcon and J.Andreina. (cherry picked from commit 7e58b2478ce10f54b9b9a647f22a69dd528a81e6) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/6581f2de Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/6581f2de Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/6581f2de Branch: refs/heads/branch-2 Commit: 6581f2dea37f5162e51ca4cc9a1bf6698ff3ad2f Parents: bdd8433 Author: Akira Ajisaka Authored: Wed Sep 20 21:07:45 2017 +0900 Committer: Akira Ajisaka Committed: Wed Sep 20 21:08:54 2017 +0900 ---------------------------------------------------------------------- .../hadoop-common/src/main/conf/log4j.properties | 12 ------------ 1 file changed, 12 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/6581f2de/hadoop-common-project/hadoop-common/src/main/conf/log4j.properties ---------------------------------------------------------------------- diff --git a/hadoop-common-project/hadoop-common/src/main/conf/log4j.properties b/hadoop-common-project/hadoop-common/src/main/conf/log4j.properties index 89b7d41..610fbf3 100644 --- a/hadoop-common-project/hadoop-common/src/main/conf/log4j.properties +++ b/hadoop-common-project/hadoop-common/src/main/conf/log4j.properties @@ -78,19 +78,7 @@ log4j.appender.console.layout.ConversionPattern=%d{yy/MM/dd HH:mm:ss} %p %c{2}: # # TaskLog Appender # - -#Default values -hadoop.tasklog.taskid=null -hadoop.tasklog.iscleanup=false -hadoop.tasklog.noKeepSplits=4 -hadoop.tasklog.totalLogFileSize=100 -hadoop.tasklog.purgeLogSplits=true -hadoop.tasklog.logsRetainHours=12 - log4j.appender.TLA=org.apache.hadoop.mapred.TaskLogAppender -log4j.appender.TLA.taskId=${hadoop.tasklog.taskid} -log4j.appender.TLA.isCleanup=${hadoop.tasklog.iscleanup} -log4j.appender.TLA.totalLogFileSize=${hadoop.tasklog.totalLogFileSize} log4j.appender.TLA.layout=org.apache.log4j.PatternLayout log4j.appender.TLA.layout.ConversionPattern=%d{ISO8601} %p %c: %m%n --------------------------------------------------------------------- To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org For additional commands, e-mail: common-commits-help@hadoop.apache.org