Backport HADOOP-3907 from trunk (svn merge -c 1358892). (harsh)

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1358894 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Harsh J 2012-07-09 02:02:53 +00:00
parent 0628876901
commit 41553468b1
2 changed files with 21 additions and 1 deletions

View File

@ -146,6 +146,9 @@ Release 2.0.0-alpha - 05-23-2012
MAPREDUCE-2220. Fix new API FileOutputFormat-related typos in
mapred-default.xml (Rui Kubo via harsh)
MAPREDUCE-3907. Document entries mapred-default.xml for the
jobhistory server. (Eugene Koontz via harsh)
OPTIMIZATIONS
BUG FIXES

View File

@ -1285,7 +1285,7 @@
<property>
<name>mapreduce.jobhistory.address</name>
<value>0.0.0.0:10020</value>
<description>MapReduce JobHistory Server host:port</description>
<description>MapReduce JobHistory Server IPC host:port</description>
</property>
<property>
@ -1294,4 +1294,21 @@
<description>MapReduce JobHistory Server Web UI host:port</description>
</property>
<property>
<name>mapreduce.jobhistory.keytab</name>
<description>
Location of the kerberos keytab file for the MapReduce
JobHistory Server.
</description>
<value>/etc/security/keytab/jhs.service.keytab</value>
</property>
<property>
<name>mapreduce.jobhistory.principal</name>
<description>
Kerberos principal name for the MapReduce JobHistory Server.
</description>
<value>jhs/_HOST@REALM.TLD</value>
</property>
</configuration>