From 8d09ab0da221341df09b2e01736111110ea62c87 Mon Sep 17 00:00:00 2001
From: Robert Joseph Evans <bobby@apache.org>
Date: Thu, 19 Apr 2012 20:35:54 +0000
Subject: [PATCH] MAPREDUCE-3947. yarn.app.mapreduce.am.resource.mb not
 documented (Devaraj K via bobby)

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1328111 13f79535-47bb-0310-9956-ffa450edef68
---
 hadoop-mapreduce-project/CHANGES.txt                        | 3 +++
 .../src/main/resources/mapred-default.xml                   | 6 ++++++
 2 files changed, 9 insertions(+)

diff --git a/hadoop-mapreduce-project/CHANGES.txt b/hadoop-mapreduce-project/CHANGES.txt
index e24658e4d4..65b2d9d330 100644
--- a/hadoop-mapreduce-project/CHANGES.txt
+++ b/hadoop-mapreduce-project/CHANGES.txt
@@ -384,6 +384,9 @@ Release 0.23.3 - UNRELEASED
     MAPREDUCE-4129. Lots of unneeded counters log messages (Ahmed Radwan via
     bobby)
 
+    MAPREDUCE-3947. yarn.app.mapreduce.am.resource.mb not documented 
+    (Devaraj K via bobby)
+
 Release 0.23.2 - UNRELEASED
 
   INCOMPATIBLE CHANGES
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 b62259039a..a60bc3ed46 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
@@ -1257,6 +1257,12 @@
     throwing exception. This is a layer above the ipc.</description>
 </property>
 
+<property>
+  <name>yarn.app.mapreduce.am.resource.mb</name>
+  <value>2048</value>
+  <description>The amount of memory the MR AppMaster needs.</description>
+</property>
+
 <!-- jobhistory properties -->
 
 <property>