Author: bobby
Date: Thu Apr 19 20:37:28 2012
New Revision: 1328113
URL: http://svn.apache.org/viewvc?rev=1328113&view=rev
Log:
svn merge -c 1328111, FIXES: MAPREDUCE-3947. yarn.app.mapreduce.am.resource.mb
not documented (Devaraj K via bobby)
Modified:
hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/CHANGES.txt
hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/resources/mapred-default.xml
Modified:
hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/CHANGES.txt?rev=1328113&r1=1328112&r2=1328113&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/CHANGES.txt
(original)
+++ hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/CHANGES.txt Thu
Apr 19 20:37:28 2012
@@ -129,6 +129,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
Modified:
hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/resources/mapred-default.xml
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/resources/mapred-default.xml?rev=1328113&r1=1328112&r2=1328113&view=diff
==============================================================================
---
hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/resources/mapred-default.xml
(original)
+++
hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/resources/mapred-default.xml
Thu Apr 19 20:37:28 2012
@@ -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>
