From 70c8cb561472b38523e1d3f4c4b0728b716433dd Mon Sep 17 00:00:00 2001 From: Haohui Mai Date: Mon, 6 Oct 2014 22:07:16 -0600 Subject: [PATCH] HADOOP-11168. Remove duplicated entry dfs.webhdfs.enabled in the user doc. Contributed by Yi Liu. --- hadoop-common-project/hadoop-common/CHANGES.txt | 3 +++ .../hadoop-common/src/site/apt/SecureMode.apt.vm | 3 --- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt b/hadoop-common-project/hadoop-common/CHANGES.txt index f98dcd7a7e6..4bcb877ed1e 100644 --- a/hadoop-common-project/hadoop-common/CHANGES.txt +++ b/hadoop-common-project/hadoop-common/CHANGES.txt @@ -457,6 +457,9 @@ Release 2.6.0 - UNRELEASED HADOOP-11151. Automatically refresh auth token and retry on auth failure. (Arun Suresh via wang) + HADOOP-11168. Remove duplicated entry "dfs.webhdfs.enabled" in the useri + doc. (Yi Liu via wheat9) + BREAKDOWN OF HDFS-6134 AND HADOOP-10150 SUBTASKS AND RELATED JIRAS HADOOP-10734. Implement high-performance secure random number sources. diff --git a/hadoop-common-project/hadoop-common/src/site/apt/SecureMode.apt.vm b/hadoop-common-project/hadoop-common/src/site/apt/SecureMode.apt.vm index c02ea39d718..f42db2d4760 100644 --- a/hadoop-common-project/hadoop-common/src/site/apt/SecureMode.apt.vm +++ b/hadoop-common-project/hadoop-common/src/site/apt/SecureMode.apt.vm @@ -469,9 +469,6 @@ Configuration for <<>> *-------------------------+-------------------------+------------------------+ || Parameter || Value || Notes | *-------------------------+-------------------------+------------------------+ -| <<>> | http/_HOST@REALM.TLD | | -| | | Enable security on WebHDFS. | -*-------------------------+-------------------------+------------------------+ | <<>> | http/_HOST@REALM.TLD | | | | | Kerberos keytab file for the WebHDFS. | *-------------------------+-------------------------+------------------------+