Repository: hadoop Updated Branches: refs/heads/branch-2 7056e50c2 -> 5af4c021c
HADOOP-11175. Fix several issues of hadoop security configuration in user doc. Contributed by Yi Liu. (cherry picked from commit 1123a06e3658f26228f1eedaed796aca8efc7bad) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/5af4c021 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/5af4c021 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/5af4c021 Branch: refs/heads/branch-2 Commit: 5af4c021cc3558de0ac8610170a1eb749e0171da Parents: 7056e50 Author: cnauroth <[email protected]> Authored: Thu Oct 9 11:10:23 2014 -0700 Committer: cnauroth <[email protected]> Committed: Thu Oct 9 11:11:13 2014 -0700 ---------------------------------------------------------------------- hadoop-common-project/hadoop-common/CHANGES.txt | 3 +++ .../src/site/apt/SecureMode.apt.vm | 20 ++++++++------------ 2 files changed, 11 insertions(+), 12 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/5af4c021/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 4eadd7f..26f97c6 100644 --- a/hadoop-common-project/hadoop-common/CHANGES.txt +++ b/hadoop-common-project/hadoop-common/CHANGES.txt @@ -620,6 +620,9 @@ Release 2.6.0 - UNRELEASED HADOOP-11179. Java untar should handle the case that the file entry comes without its parent directory entry. (Craig Welch via zjshen) + HADOOP-11175. Fix several issues of hadoop security configuration in user + doc. (Yi Liu via cnauroth) + Release 2.5.1 - 2014-09-05 INCOMPATIBLE CHANGES http://git-wip-us.apache.org/repos/asf/hadoop/blob/5af4c021/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 f42db2d..54473e6 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 @@ -402,8 +402,8 @@ Configuration for <<<conf/core-site.xml>>> | <<<dfs.namenode.kerberos.principal>>> | nn/[email protected] | | | | | Kerberos principal name for the NameNode. | *-------------------------+-------------------------+------------------------+ -| <<<dfs.namenode.kerberos.https.principal>>> | host/[email protected] | | -| | | HTTPS Kerberos principal name for the NameNode. | +| <<<dfs.namenode.kerberos.internal.spnego.principal>>> | HTTP/[email protected] | | +| | | HTTP Kerberos principal name for the NameNode. | *-------------------------+-------------------------+------------------------+ Configuration for <<<conf/hdfs-site.xml>>> @@ -416,16 +416,16 @@ Configuration for <<<conf/hdfs-site.xml>>> *-------------------------+-------------------------+------------------------+ | <<<dfs.namenode.secondary.https-port>>> | <50470> | | *-------------------------+-------------------------+------------------------+ -| <<<dfs.namenode.secondary.keytab.file>>> | | | +| <<<dfs.secondary.namenode.keytab.file>>> | | | | | </etc/security/keytab/sn.service.keytab> | | -| | | Kerberos keytab file for the NameNode. | +| | | Kerberos keytab file for the Secondary NameNode. | *-------------------------+-------------------------+------------------------+ -| <<<dfs.namenode.secondary.kerberos.principal>>> | sn/[email protected] | | +| <<<dfs.secondary.namenode.kerberos.principal>>> | sn/[email protected] | | | | | Kerberos principal name for the Secondary NameNode. | *-------------------------+-------------------------+------------------------+ -| <<<dfs.namenode.secondary.kerberos.https.principal>>> | | | -| | host/[email protected] | | -| | | HTTPS Kerberos principal name for the Secondary NameNode. | +| <<<dfs.secondary.namenode.kerberos.internal.spnego.principal>>> | | | +| | HTTP/[email protected] | | +| | | HTTP Kerberos principal name for the Secondary NameNode. | *-------------------------+-------------------------+------------------------+ Configuration for <<<conf/hdfs-site.xml>>> @@ -454,10 +454,6 @@ Configuration for <<<conf/hdfs-site.xml>>> | <<<dfs.datanode.kerberos.principal>>> | dn/[email protected] | | | | | Kerberos principal name for the DataNode. | *-------------------------+-------------------------+------------------------+ -| <<<dfs.datanode.kerberos.https.principal>>> | | | -| | host/[email protected] | | -| | | HTTPS Kerberos principal name for the DataNode. | -*-------------------------+-------------------------+------------------------+ | <<<dfs.encrypt.data.transfer>>> | <false> | | | | | set to <<<true>>> when using data encryption | *-------------------------+-------------------------+------------------------+
