diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt b/hadoop-common-project/hadoop-common/CHANGES.txt index 2d27e7ccfb..c36d497759 100644 --- a/hadoop-common-project/hadoop-common/CHANGES.txt +++ b/hadoop-common-project/hadoop-common/CHANGES.txt @@ -795,6 +795,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 c02ea39d71..f42db2d476 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. | *-------------------------+-------------------------+------------------------+