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 ha...@apache.org on 2012/07/09 04:01:54 UTC
svn commit: r1358892 - in /hadoop/common/trunk/hadoop-mapreduce-project:
CHANGES.txt
hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/resources/mapred-default.xml
Author: harsh
Date: Mon Jul 9 02:01:54 2012
New Revision: 1358892
URL: http://svn.apache.org/viewvc?rev=1358892&view=rev
Log:
MAPREDUCE-3907. Document entries mapred-default.xml for the jobhistory server. Contributed by Eugene Koontz. (harsh)
Modified:
hadoop/common/trunk/hadoop-mapreduce-project/CHANGES.txt
hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/resources/mapred-default.xml
Modified: hadoop/common/trunk/hadoop-mapreduce-project/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-mapreduce-project/CHANGES.txt?rev=1358892&r1=1358891&r2=1358892&view=diff
==============================================================================
--- hadoop/common/trunk/hadoop-mapreduce-project/CHANGES.txt (original)
+++ hadoop/common/trunk/hadoop-mapreduce-project/CHANGES.txt Mon Jul 9 02:01:54 2012
@@ -151,6 +151,9 @@ Branch-2 ( Unreleased changes )
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
Modified: hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/resources/mapred-default.xml
URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/resources/mapred-default.xml?rev=1358892&r1=1358891&r2=1358892&view=diff
==============================================================================
--- hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/resources/mapred-default.xml (original)
+++ hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/resources/mapred-default.xml Mon Jul 9 02:01:54 2012
@@ -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>