Return-Path: <common-commits-return-57455-archive-asf-public=cust-asf.ponee.io@hadoop.apache.org>
X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io
Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io
Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183])
	by cust-asf2.ponee.io (Postfix) with ESMTP id 8345E200BBF
	for <archive-asf-public-internal@cust-asf2.ponee.io>; Mon, 31 Oct 2016 07:19:21 +0100 (CET)
Received: by cust-asf.ponee.io (Postfix)
	id 7F81C160AF8; Mon, 31 Oct 2016 06:19:21 +0000 (UTC)
Delivered-To: archive-asf-public@cust-asf.ponee.io
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by cust-asf.ponee.io (Postfix) with SMTP id C5FE8160AF1
	for <archive-asf-public@cust-asf.ponee.io>; Mon, 31 Oct 2016 07:19:20 +0100 (CET)
Received: (qmail 4856 invoked by uid 500); 31 Oct 2016 06:19:19 -0000
Mailing-List: contact common-commits-help@hadoop.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:common-commits-help@hadoop.apache.org>
List-Unsubscribe: <mailto:common-commits-unsubscribe@hadoop.apache.org>
List-Post: <mailto:common-commits@hadoop.apache.org>
List-Id: <common-commits.hadoop.apache.org>
Delivered-To: mailing list common-commits@hadoop.apache.org
Received: (qmail 4847 invoked by uid 99); 31 Oct 2016 06:19:19 -0000
Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23)
    by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 31 Oct 2016 06:19:19 +0000
Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33)
	id BEE86E08B3; Mon, 31 Oct 2016 06:19:19 +0000 (UTC)
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
From: aajisaka@apache.org
To: common-commits@hadoop.apache.org
Message-Id: <d9117861ff7a40f1af03107b23f6fe40@git.apache.org>
X-Mailer: ASF-Git Admin Mailer
Subject: hadoop git commit: MAPREDUCE-6799. Document
 mapreduce.jobhistory.webapp.https.address in mapred-default.xml. Contributed
 by Yiqun Lin.
Date: Mon, 31 Oct 2016 06:19:19 +0000 (UTC)
archived-at: Mon, 31 Oct 2016 06:19:21 -0000

Repository: hadoop
Updated Branches:
  refs/heads/branch-2 0e6fcd3bd -> ef13a5ef9


MAPREDUCE-6799. Document mapreduce.jobhistory.webapp.https.address in mapred-default.xml. Contributed by Yiqun Lin.

(cherry picked from commit f646fe34be704a22cbea322cce2826f8f201bd34)


Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/ef13a5ef
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/ef13a5ef
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/ef13a5ef

Branch: refs/heads/branch-2
Commit: ef13a5ef9d7859cbb720ee46ebed8172358ad0d5
Parents: 0e6fcd3
Author: Akira Ajisaka <aajisaka@apache.org>
Authored: Mon Oct 31 15:17:20 2016 +0900
Committer: Akira Ajisaka <aajisaka@apache.org>
Committed: Mon Oct 31 15:18:34 2016 +0900

----------------------------------------------------------------------
 .../src/main/resources/mapred-default.xml                    | 8 ++++++++
 1 file changed, 8 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hadoop/blob/ef13a5ef/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/resources/mapred-default.xml
----------------------------------------------------------------------
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 c70d6df..523dd28 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
@@ -1628,6 +1628,14 @@
 </property>
 
 <property>
+  <name>mapreduce.jobhistory.webapp.https.address</name>
+  <value>0.0.0.0:19890</value>
+  <description>
+    The https address the MapReduce JobHistory Server WebApp is on.
+  </description>
+</property>
+
+<property>
   <name>mapreduce.jobhistory.keytab</name>
   <description>
     Location of the kerberos keytab file for the MapReduce


---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org