svn merge -c 1328111, FIXES: 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/branches/branch-0.23@1328113 13f79535-47bb-0310-9956-ffa450edef68

hadoop-mapreduce-project/CHANGES.txt

@@ -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

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>