From 3854b21c4c2c7f8692480c165be125f2b33c71a8 Mon Sep 17 00:00:00 2001 From: Tsuyoshi Ozawa Date: Mon, 2 Mar 2015 04:18:07 +0900 Subject: [PATCH] HADOOP-11634. Description of webhdfs' principal/keytab should switch places each other. Contributed by Brahma Reddy Battula. (cherry picked from commit e9ac88aac77dd98508854de445793c2180466ee8) --- hadoop-common-project/hadoop-common/CHANGES.txt | 3 +++ .../hadoop-common/src/site/markdown/SecureMode.md | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt b/hadoop-common-project/hadoop-common/CHANGES.txt index 3a8bc6fef54..b9252b58642 100644 --- a/hadoop-common-project/hadoop-common/CHANGES.txt +++ b/hadoop-common-project/hadoop-common/CHANGES.txt @@ -614,6 +614,9 @@ Release 2.7.0 - UNRELEASED HADOOP-9922. hadoop windows native build will fail in 32 bit machine. (Kiran Kumar M R via cnauroth) + HADOOP-11634. Description of webhdfs' principal/keytab should switch places + each other. (Brahma Reddy Battula via ozawa) + Release 2.6.1 - UNRELEASED INCOMPATIBLE CHANGES diff --git a/hadoop-common-project/hadoop-common/src/site/markdown/SecureMode.md b/hadoop-common-project/hadoop-common/src/site/markdown/SecureMode.md index 0004d256e0d..cb27e29cf6e 100644 --- a/hadoop-common-project/hadoop-common/src/site/markdown/SecureMode.md +++ b/hadoop-common-project/hadoop-common/src/site/markdown/SecureMode.md @@ -289,8 +289,8 @@ The following properties should be in the `core-site.xml` of all the nodes in th | Parameter | Value | Notes | |:---- |:---- |:---- | -| `dfs.web.authentication.kerberos.principal` | http/\_HOST@REALM.TLD | Kerberos keytab file for the WebHDFS. | -| `dfs.web.authentication.kerberos.keytab` | */etc/security/keytab/http.service.keytab* | Kerberos principal name for WebHDFS. | +| `dfs.web.authentication.kerberos.principal` | http/\_HOST@REALM.TLD | Kerberos principal name for the WebHDFS. | +| `dfs.web.authentication.kerberos.keytab` | */etc/security/keytab/http.service.keytab* | Kerberos keytab file for WebHDFS. | ### ResourceManager