From 41553468b1ffc3af5392610f2799bd173e0b1849 Mon Sep 17 00:00:00 2001
From: Harsh J <harsh@apache.org>
Date: Mon, 9 Jul 2012 02:02:53 +0000
Subject: [PATCH] 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
---
 hadoop-mapreduce-project/CHANGES.txt          |  3 +++
 .../src/main/resources/mapred-default.xml     | 19 ++++++++++++++++++-
 2 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/hadoop-mapreduce-project/CHANGES.txt b/hadoop-mapreduce-project/CHANGES.txt
index 8ffb2223458..068d5739830 100644
--- a/hadoop-mapreduce-project/CHANGES.txt
+++ b/hadoop-mapreduce-project/CHANGES.txt
@@ -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
diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/resources/mapred-default.xml b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/resources/mapred-default.xml
index dea12ca6ee1..8591079b3a8 100644
--- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/resources/mapred-default.xml
+++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/resources/mapred-default.xml
@@ -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>