Return-Path: X-Original-To: apmail-hadoop-common-commits-archive@www.apache.org Delivered-To: apmail-hadoop-common-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 267961816C for ; Sat, 2 May 2015 01:23:52 +0000 (UTC) Received: (qmail 34295 invoked by uid 500); 2 May 2015 01:23:51 -0000 Delivered-To: apmail-hadoop-common-commits-archive@hadoop.apache.org Received: (qmail 34223 invoked by uid 500); 2 May 2015 01:23:51 -0000 Mailing-List: contact common-commits-help@hadoop.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: common-dev@hadoop.apache.org Delivered-To: mailing list common-commits@hadoop.apache.org Received: (qmail 34206 invoked by uid 99); 2 May 2015 01:23:51 -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; Sat, 02 May 2015 01:23:51 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id A8EDFE17E2; Sat, 2 May 2015 01:23:51 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: gera@apache.org To: common-commits@hadoop.apache.org Date: Sat, 02 May 2015 01:23:54 -0000 Message-Id: <4d2bae44bdc443b3b6df7d322da64675@git.apache.org> In-Reply-To: <59b2b782282c46fbb7ff812e3ccfa1c6@git.apache.org> References: <59b2b782282c46fbb7ff812e3ccfa1c6@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [4/4] hadoop git commit: MAPREDUCE-6345. Documentation fix for when CRLA is enabled for MRAppMaster logs. (Rohit Agarwal via gera) MAPREDUCE-6345. Documentation fix for when CRLA is enabled for MRAppMaster logs. (Rohit Agarwal via gera) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/f1a152cc Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/f1a152cc Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/f1a152cc Branch: refs/heads/trunk Commit: f1a152cc0adc071277c80637ea6f5faa0bf06a1a Parents: 3ddb260 Author: Gera Shegalov Authored: Fri May 1 16:13:56 2015 -0700 Committer: Gera Shegalov Committed: Fri May 1 18:18:56 2015 -0700 ---------------------------------------------------------------------- hadoop-mapreduce-project/CHANGES.txt | 3 +++ .../src/main/resources/mapred-default.xml | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/f1a152cc/hadoop-mapreduce-project/CHANGES.txt ---------------------------------------------------------------------- diff --git a/hadoop-mapreduce-project/CHANGES.txt b/hadoop-mapreduce-project/CHANGES.txt index c073470..2d87444 100644 --- a/hadoop-mapreduce-project/CHANGES.txt +++ b/hadoop-mapreduce-project/CHANGES.txt @@ -356,6 +356,9 @@ Release 2.8.0 - UNRELEASED MAPREDUCE-6341. Fix typo in mapreduce tutorial. (John Michael Luy via ozawa) + MAPREDUCE-6345. Documentation fix for when CRLA is enabled for MRAppMaster + logs. (Rohit Agarwal via gera) + Release 2.7.1 - UNRELEASED INCOMPATIBLE CHANGES http://git-wip-us.apache.org/repos/asf/hadoop/blob/f1a152cc/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/resources/mapred-default.xml ---------------------------------------------------------------------- diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/resources/mapred-default.xml b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/resources/mapred-default.xml index ff4511f..d776d44 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/resources/mapred-default.xml +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/resources/mapred-default.xml @@ -739,7 +739,7 @@ org.apache.log4j.RollingFileAppender.maxBackupIndex. By default, ContainerLogAppender (CLA) is used, and container logs are not rolled. CRLA is enabled for the ApplicationMaster when both - mapreduce.task.userlog.limit.kb and + yarn.app.mapreduce.am.container.log.limit.kb and yarn.app.mapreduce.am.container.log.backups are greater than zero.