You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by sz...@apache.org on 2011/09/28 06:54:49 UTC
svn commit: r1176721 - in /hadoop/common/branches/branch-0.20-security-205:
./ CHANGES.txt src/hdfs/hdfs-default.xml
src/packages/templates/conf/hdfs-site.xml
Author: szetszwo
Date: Wed Sep 28 04:54:49 2011
New Revision: 1176721
URL: http://svn.apache.org/viewvc?rev=1176721&view=rev
Log:
svn merge -c 1176720 from branch-0.20-security for HDFS-2368.
Modified:
hadoop/common/branches/branch-0.20-security-205/ (props changed)
hadoop/common/branches/branch-0.20-security-205/CHANGES.txt (contents, props changed)
hadoop/common/branches/branch-0.20-security-205/src/hdfs/hdfs-default.xml
hadoop/common/branches/branch-0.20-security-205/src/packages/templates/conf/hdfs-site.xml
Propchange: hadoop/common/branches/branch-0.20-security-205/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Sep 28 04:54:49 2011
@@ -1,6 +1,6 @@
/hadoop/common/branches/branch-0.20:826138,826568,829987,831184,833001,880632,898713,909245,909723,960946,990003,1044225
/hadoop/common/branches/branch-0.20-append:955380,955398,955448,956329
-/hadoop/common/branches/branch-0.20-security:1170042,1170087,1170997,1171137,1171380,1171613,1171891,1171905,1172184,1172188,1172190,1172192,1173470,1174471,1175114,1176179
+/hadoop/common/branches/branch-0.20-security:1170042,1170087,1170997,1171137,1171380,1171613,1171891,1171905,1172184,1172188,1172190,1172192,1173470,1174471,1175114,1176179,1176720
/hadoop/common/branches/branch-0.20-security-203:1096071,1097011,1097249,1097269,1097281,1097966,1098816,1098819,1098823,1098827,1098832,1098839,1098854,1098863,1099088,1099191,1099324,1099330,1099333,1102071,1128115
/hadoop/common/branches/branch-0.20-security-204:1128390,1147228,1148069,1149316,1154413
/hadoop/core/branches/branch-0.19:713112
Modified: hadoop/common/branches/branch-0.20-security-205/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security-205/CHANGES.txt?rev=1176721&r1=1176720&r2=1176721&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.20-security-205/CHANGES.txt (original)
+++ hadoop/common/branches/branch-0.20-security-205/CHANGES.txt Wed Sep 28 04:54:49 2011
@@ -321,6 +321,9 @@ Release 0.20.205.0 - 2011.09.27
HADOOP-7510. Add configurable option to use original hostname in token
instead of IP to allow server IP change. (Daryn Sharp via suresh)
+ HDFS-2368. Move SPNEGO conf properties from hdfs-default.xml to
+ hdfs-site.xml. (szetszwo)
+
Release 0.20.204.0 - 2011-8-25
NEW FEATURES
Propchange: hadoop/common/branches/branch-0.20-security-205/CHANGES.txt
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Sep 28 04:54:49 2011
@@ -1,6 +1,6 @@
/hadoop/common/branches/branch-0.20/CHANGES.txt:826138,826568,829987,831184,833001,880632,898713,909245,909723,960946,990003,1044225
/hadoop/common/branches/branch-0.20-append/CHANGES.txt:955380,955398,955448,956329
-/hadoop/common/branches/branch-0.20-security/CHANGES.txt:1170042,1170087,1170997,1171137,1171181,1171380,1171613,1171891,1171905,1172184,1172188,1172190,1172192,1173470,1173843,1174326,1174471,1174476,1174482,1175114,1176179,1176182,1176270,1176276,1176675
+/hadoop/common/branches/branch-0.20-security/CHANGES.txt:1170042,1170087,1170997,1171137,1171181,1171380,1171613,1171891,1171905,1172184,1172188,1172190,1172192,1173470,1173843,1174326,1174471,1174476,1174482,1175114,1176179,1176182,1176270,1176276,1176675,1176720
/hadoop/common/branches/branch-0.20-security-203/CHANGES.txt:1096071,1097011,1097249,1097269,1097281,1097966,1098816,1098819,1098823,1098827,1098832,1098839,1098854,1098863,1099088,1099191,1099324,1099330,1099333,1102071,1128115
/hadoop/common/branches/branch-0.20-security-204/CHANGES.txt:1128390,1147228,1148069,1149316,1154413,1159730,1161741
/hadoop/core/branches/branch-0.18/CHANGES.txt:727226
Modified: hadoop/common/branches/branch-0.20-security-205/src/hdfs/hdfs-default.xml
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security-205/src/hdfs/hdfs-default.xml?rev=1176721&r1=1176720&r2=1176721&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.20-security-205/src/hdfs/hdfs-default.xml (original)
+++ hadoop/common/branches/branch-0.20-security-205/src/hdfs/hdfs-default.xml Wed Sep 28 04:54:49 2011
@@ -426,24 +426,4 @@ creations/deletions), or "all".</descrip
</description>
</property>
-<property>
- <name>dfs.web.authentication.kerberos.principal</name>
- <value>HTTP/${dfs.web.hostname}@${kerberos.realm}</value>
- <description>
- The HTTP Kerberos principal used by Hadoop-Auth in the HTTP endpoint.
-
- The HTTP Kerberos principal MUST start with 'HTTP/' per Kerberos
- HTTP SPENGO specification.
- </description>
-</property>
-
-<property>
- <name>dfs.web.authentication.kerberos.keytab</name>
- <value>${user.home}/dfs.web.keytab</value>
- <description>
- The Kerberos keytab file with the credentials for the
- HTTP Kerberos principal used by Hadoop-Auth in the HTTP endpoint.
- </description>
-</property>
-
</configuration>
Modified: hadoop/common/branches/branch-0.20-security-205/src/packages/templates/conf/hdfs-site.xml
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security-205/src/packages/templates/conf/hdfs-site.xml?rev=1176721&r1=1176720&r2=1176721&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.20-security-205/src/packages/templates/conf/hdfs-site.xml (original)
+++ hadoop/common/branches/branch-0.20-security-205/src/packages/templates/conf/hdfs-site.xml Wed Sep 28 04:54:49 2011
@@ -124,6 +124,26 @@
</property>
<property>
+ <name>dfs.web.authentication.kerberos.principal</name>
+ <value>HTTP/_HOST@${local.realm}</value>
+ <description>
+ The HTTP Kerberos principal used by Hadoop-Auth in the HTTP endpoint.
+
+ The HTTP Kerberos principal MUST start with 'HTTP/' per Kerberos
+ HTTP SPENGO specification.
+ </description>
+ </property>
+
+ <property>
+ <name>dfs.web.authentication.kerberos.keytab</name>
+ <value>/etc/security/keytabs/nn.service.keytab</value>
+ <description>
+ The Kerberos keytab file with the credentials for the
+ HTTP Kerberos principal used by Hadoop-Auth in the HTTP endpoint.
+ </description>
+ </property>
+
+ <property>
<name>dfs.namenode.keytab.file</name>
<value>/etc/security/keytabs/nn.service.keytab</value>
<description>