You are viewing a plain text version of this content. The canonical link for it is here.
Posted to mapreduce-commits@hadoop.apache.org by bo...@apache.org on 2012/07/09 16:05:52 UTC
svn commit: r1359179 - in
/hadoop/common/branches/branch-0.23/hadoop-mapreduce-project: CHANGES.txt
hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/resources/mapred-default.xml
Author: bobby
Date: Mon Jul 9 14:05:51 2012
New Revision: 1359179
URL: http://svn.apache.org/viewvc?rev=1359179&view=rev
Log:
Backport HADOOP-3907 from trunk (svn merge -c 1358892). (harsh)
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=1359179&r1=1359178&r2=1359179&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 Mon Jul 9 14:05:51 2012
@@ -50,6 +50,9 @@ Release 0.23.3 - UNRELEASED
MAPREDUCE-3906. Fix inconsistency in documentation regarding
mapreduce.jobhistory.principal. (Eugene Koontz via harsh)
+ MAPREDUCE-3907. Document entries mapred-default.xml for the
+ jobhistory server. (Eugene Koontz via harsh)
+
OPTIMIZATIONS
MAPREDUCE-3850. Avoid redundant calls for tokens in TokenCache (Daryn
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=1359179&r1=1359178&r2=1359179&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 Mon Jul 9 14:05:51 2012
@@ -1276,7 +1276,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>
@@ -1285,4 +1285,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>