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 3D693176F2 for ; Sun, 1 Mar 2015 07:00:21 +0000 (UTC) Received: (qmail 96181 invoked by uid 500); 1 Mar 2015 06:53:41 -0000 Delivered-To: apmail-hadoop-common-commits-archive@hadoop.apache.org Received: (qmail 96116 invoked by uid 500); 1 Mar 2015 06:53:41 -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 96107 invoked by uid 99); 1 Mar 2015 06:53:41 -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; Sun, 01 Mar 2015 06:53:41 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id A88DDE0B41; Sun, 1 Mar 2015 06:53:41 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: aw@apache.org To: common-commits@hadoop.apache.org Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: hadoop git commit: MAPREDUCE-5653. DistCp does not honour config-overrides for mapreduce.[map, reduce].memory.mb (Ratandeep Ratti via aw) Date: Sun, 1 Mar 2015 06:53:41 +0000 (UTC) Repository: hadoop Updated Branches: refs/heads/trunk 915bec3e8 -> 039366e3b MAPREDUCE-5653. DistCp does not honour config-overrides for mapreduce.[map,reduce].memory.mb (Ratandeep Ratti via aw) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/039366e3 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/039366e3 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/039366e3 Branch: refs/heads/trunk Commit: 039366e3b430ff7d9a7ff30405a0431292069a8a Parents: 915bec3 Author: Allen Wittenauer Authored: Sat Feb 28 22:53:38 2015 -0800 Committer: Allen Wittenauer Committed: Sat Feb 28 22:53:38 2015 -0800 ---------------------------------------------------------------------- hadoop-mapreduce-project/CHANGES.txt | 3 +++ .../hadoop-distcp/src/main/resources/distcp-default.xml | 10 ---------- 2 files changed, 3 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/039366e3/hadoop-mapreduce-project/CHANGES.txt ---------------------------------------------------------------------- diff --git a/hadoop-mapreduce-project/CHANGES.txt b/hadoop-mapreduce-project/CHANGES.txt index f509d4e..ccd24a6 100644 --- a/hadoop-mapreduce-project/CHANGES.txt +++ b/hadoop-mapreduce-project/CHANGES.txt @@ -6,6 +6,9 @@ Trunk (Unreleased) MAPREDUCE-5785. Derive heap size or mapreduce.*.memory.mb automatically. (Gera Shegalov and Karthik Kambatla via gera) + MAPREDUCE-5653. DistCp does not honour config-overrides for + mapreduce.[map,reduce].memory.mb (Ratandeep Ratti via aw) + NEW FEATURES MAPREDUCE-778. Rumen Anonymizer. (Amar Kamat and Chris Douglas via amarrk) http://git-wip-us.apache.org/repos/asf/hadoop/blob/039366e3/hadoop-tools/hadoop-distcp/src/main/resources/distcp-default.xml ---------------------------------------------------------------------- diff --git a/hadoop-tools/hadoop-distcp/src/main/resources/distcp-default.xml b/hadoop-tools/hadoop-distcp/src/main/resources/distcp-default.xml index f50dddd..6e1154e 100644 --- a/hadoop-tools/hadoop-distcp/src/main/resources/distcp-default.xml +++ b/hadoop-tools/hadoop-distcp/src/main/resources/distcp-default.xml @@ -32,16 +32,6 @@ - mapred.job.map.memory.mb - 1024 - - - - mapred.job.reduce.memory.mb - 1024 - - - mapred.reducer.new-api true