Author: kihwal
Date: Thu May 8 18:28:22 2014
New Revision: 1593363
URL: http://svn.apache.org/r1593363
Log:
svn merge -c 1593362 merging from trunk to branch-2 to fix:HADOOP-10158. SPNEGO
should work with multiple interfaces/SPNs. Contributed by Daryn Sharp.
Modified:
hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/site/apt/WebHDFS.apt.vm
Modified:
hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/site/apt/WebHDFS.apt.vm
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/site/apt/WebHDFS.apt.vm?rev=1593363&r1=1593362&r2=1593363&view=diff
==============================================================================
---
hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/site/apt/WebHDFS.apt.vm
(original)
+++
hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/site/apt/WebHDFS.apt.vm
Thu May 8 18:28:22 2014
@@ -146,7 +146,7 @@ WebHDFS REST API
*-------------------------------------------------+---------------------------------------------------+
| <<<dfs.webhdfs.enabled >>> | Enable/disable WebHDFS in
Namenodes and Datanodes |
*-------------------------------------------------+---------------------------------------------------+
-| <<<dfs.web.authentication.kerberos.principal>>> | The HTTP Kerberos
principal used by Hadoop-Auth in the HTTP endpoint. The HTTP Kerberos principal
MUST start with 'HTTP/' per Kerberos HTTP SPNEGO specification. |
+| <<<dfs.web.authentication.kerberos.principal>>> | The HTTP Kerberos
principal used by Hadoop-Auth in the HTTP endpoint. The HTTP Kerberos principal
MUST start with 'HTTP/' per Kerberos HTTP SPNEGO specification. A value of "*"
will use all HTTP principals found in the keytab. |
*-------------------------------------------------+---------------------------------------------------+
| <<<dfs.web.authentication.kerberos.keytab >>> | The Kerberos keytab file
with the credentials for the HTTP Kerberos principal used by Hadoop-Auth in the
HTTP endpoint. |
*-------------------------------------------------+---------------------------------------------------+
