Return-Path: X-Original-To: apmail-hadoop-mapreduce-commits-archive@minotaur.apache.org Delivered-To: apmail-hadoop-mapreduce-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 165F2D964 for ; Mon, 9 Jul 2012 02:03:15 +0000 (UTC) Received: (qmail 18696 invoked by uid 500); 9 Jul 2012 02:03:14 -0000 Delivered-To: apmail-hadoop-mapreduce-commits-archive@hadoop.apache.org Received: (qmail 18626 invoked by uid 500); 9 Jul 2012 02:03:14 -0000 Mailing-List: contact mapreduce-commits-help@hadoop.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: mapreduce-dev@hadoop.apache.org Delivered-To: mailing list mapreduce-commits@hadoop.apache.org Received: (qmail 18612 invoked by uid 99); 9 Jul 2012 02:03:14 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 09 Jul 2012 02:03:14 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 09 Jul 2012 02:03:13 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id C903C23888E4; Mon, 9 Jul 2012 02:02:53 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1358894 - in /hadoop/common/branches/branch-2/hadoop-mapreduce-project: CHANGES.txt hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/resources/mapred-default.xml Date: Mon, 09 Jul 2012 02:02:53 -0000 To: mapreduce-commits@hadoop.apache.org From: harsh@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120709020253.C903C23888E4@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: harsh Date: Mon Jul 9 02:02:53 2012 New Revision: 1358894 URL: http://svn.apache.org/viewvc?rev=1358894&view=rev Log: Backport HADOOP-3907 from trunk (svn merge -c 1358892). (harsh) Modified: hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/resources/mapred-default.xml Modified: hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt?rev=1358894&r1=1358893&r2=1358894&view=diff ============================================================================== --- hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt (original) +++ hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt Mon Jul 9 02:02:53 2012 @@ -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 Modified: hadoop/common/branches/branch-2/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-2/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/resources/mapred-default.xml?rev=1358894&r1=1358893&r2=1358894&view=diff ============================================================================== --- hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/resources/mapred-default.xml (original) +++ hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/resources/mapred-default.xml Mon Jul 9 02:02:53 2012 @@ -1285,7 +1285,7 @@ mapreduce.jobhistory.address 0.0.0.0:10020 - MapReduce JobHistory Server host:port + MapReduce JobHistory Server IPC host:port @@ -1294,4 +1294,21 @@ MapReduce JobHistory Server Web UI host:port + + mapreduce.jobhistory.keytab + + Location of the kerberos keytab file for the MapReduce + JobHistory Server. + + /etc/security/keytab/jhs.service.keytab + + + + mapreduce.jobhistory.principal + + Kerberos principal name for the MapReduce JobHistory Server. + + jhs/_HOST@REALM.TLD + +