Repository: hadoop Updated Branches: refs/heads/branch-2.6 efc482d1f -> 1bd45fa16
HADOOP-11168. Remove duplicated entry dfs.webhdfs.enabled in the user doc. Contributed by Yi Liu. Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/1bd45fa1 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/1bd45fa1 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/1bd45fa1 Branch: refs/heads/branch-2.6 Commit: 1bd45fa1654d6b902f0b61eeea99aa93edc5d219 Parents: efc482d Author: Haohui Mai <[email protected]> Authored: Mon Oct 6 22:07:16 2014 -0600 Committer: Haohui Mai <[email protected]> Committed: Mon Oct 6 22:08:01 2014 -0600 ---------------------------------------------------------------------- hadoop-common-project/hadoop-common/CHANGES.txt | 3 +++ .../hadoop-common/src/site/apt/SecureMode.apt.vm | 3 --- 2 files changed, 3 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/1bd45fa1/hadoop-common-project/hadoop-common/CHANGES.txt ---------------------------------------------------------------------- diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt b/hadoop-common-project/hadoop-common/CHANGES.txt index 6e92ebc..4239531 100644 --- a/hadoop-common-project/hadoop-common/CHANGES.txt +++ b/hadoop-common-project/hadoop-common/CHANGES.txt @@ -439,6 +439,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. http://git-wip-us.apache.org/repos/asf/hadoop/blob/1bd45fa1/hadoop-common-project/hadoop-common/src/site/apt/SecureMode.apt.vm ---------------------------------------------------------------------- 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 c02ea39..f42db2d 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 <<<conf/hdfs-site.xml>>> *-------------------------+-------------------------+------------------------+ || Parameter || Value || Notes | *-------------------------+-------------------------+------------------------+ -| <<<dfs.webhdfs.enabled>>> | http/[email protected] | | -| | | Enable security on WebHDFS. | -*-------------------------+-------------------------+------------------------+ | <<<dfs.web.authentication.kerberos.principal>>> | http/[email protected] | | | | | Kerberos keytab file for the WebHDFS. | *-------------------------+-------------------------+------------------------+
