svn commit: r1606534 - in /hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs: CHANGES.txt src/main/java/org/apache/hadoop/hdfs/DFSConfigKeys.java

[stevel]

Author: stevel
Date: Sun Jun 29 16:19:16 2014
New Revision: 1606534

URL: http://svn.apache.org/r1606534
Log:
HDFS-6418. Regression: DFS_NAMENODE_USER_NAME_KEY missing

Modified:
    hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
    
hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/DFSConfigKeys.java

Modified: 
hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt?rev=1606534&r1=1606533&r2=1606534&view=diff
==============================================================================
--- hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt 
(original)
+++ hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt 
Sun Jun 29 16:19:16 2014
@@ -481,6 +481,9 @@ Release 2.5.0 - UNRELEASED
     HDFS-6601. Issues in finalizing rolling upgrade when there is a layout 
     version change (kihwal)
 
+    HDFS-6418. Regression: DFS_NAMENODE_USER_NAME_KEY missing
+    (szetszwo via stevel)
+
   BREAKDOWN OF HDFS-2006 SUBTASKS AND RELATED JIRAS
 
     HDFS-6299. Protobuf for XAttr and client-side implementation. (Yi Liu via 
umamahesh)

Modified: 
hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/DFSConfigKeys.java
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/DFSConfigKeys.java?rev=1606534&r1=1606533&r2=1606534&view=diff
==============================================================================
--- 
hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/DFSConfigKeys.java
 (original)
+++ 
hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/DFSConfigKeys.java
 Sun Jun 29 16:19:16 2014
@@ -500,16 +500,26 @@ public class DFSConfigKeys extends Commo
   public static final String  DFS_NAMENODE_STARTUP_KEY = 
"dfs.namenode.startup";
   public static final String  DFS_DATANODE_KEYTAB_FILE_KEY = 
"dfs.datanode.keytab.file";
   public static final String  DFS_DATANODE_KERBEROS_PRINCIPAL_KEY = 
"dfs.datanode.kerberos.principal";
+  @Deprecated
+  public static final String  DFS_DATANODE_USER_NAME_KEY = 
DFS_DATANODE_KERBEROS_PRINCIPAL_KEY;
   public static final String  DFS_DATANODE_SHARED_FILE_DESCRIPTOR_PATHS = 
"dfs.datanode.shared.file.descriptor.paths";
   public static final String  
DFS_DATANODE_SHARED_FILE_DESCRIPTOR_PATHS_DEFAULT = "/dev/shm,/tmp";
   public static final String  
DFS_SHORT_CIRCUIT_SHARED_MEMORY_WATCHER_INTERRUPT_CHECK_MS = 
"dfs.short.circuit.shared.memory.watcher.interrupt.check.ms";
   public static final int     
DFS_SHORT_CIRCUIT_SHARED_MEMORY_WATCHER_INTERRUPT_CHECK_MS_DEFAULT = 60000;
   public static final String  DFS_NAMENODE_KEYTAB_FILE_KEY = 
"dfs.namenode.keytab.file";
   public static final String  DFS_NAMENODE_KERBEROS_PRINCIPAL_KEY = 
"dfs.namenode.kerberos.principal";
+  @Deprecated
+  public static final String  DFS_NAMENODE_USER_NAME_KEY = 
DFS_NAMENODE_KERBEROS_PRINCIPAL_KEY;
   public static final String  
DFS_NAMENODE_KERBEROS_INTERNAL_SPNEGO_PRINCIPAL_KEY = 
"dfs.namenode.kerberos.internal.spnego.principal";
+  @Deprecated
+  public static final String  DFS_NAMENODE_INTERNAL_SPNEGO_USER_NAME_KEY = 
DFS_NAMENODE_KERBEROS_INTERNAL_SPNEGO_PRINCIPAL_KEY;
   public static final String  DFS_SECONDARY_NAMENODE_KEYTAB_FILE_KEY = 
"dfs.secondary.namenode.keytab.file";
   public static final String  DFS_SECONDARY_NAMENODE_KERBEROS_PRINCIPAL_KEY = 
"dfs.secondary.namenode.kerberos.principal";
+  @Deprecated
+  public static final String  DFS_SECONDARY_NAMENODE_USER_NAME_KEY = 
DFS_SECONDARY_NAMENODE_KERBEROS_PRINCIPAL_KEY;
   public static final String  
DFS_SECONDARY_NAMENODE_KERBEROS_INTERNAL_SPNEGO_PRINCIPAL_KEY = 
"dfs.secondary.namenode.kerberos.internal.spnego.principal";
+  @Deprecated
+  public static final String  
DFS_SECONDARY_NAMENODE_INTERNAL_SPNEGO_USER_NAME_KEY = 
DFS_SECONDARY_NAMENODE_KERBEROS_INTERNAL_SPNEGO_PRINCIPAL_KEY;
   public static final String  DFS_NAMENODE_NAME_CACHE_THRESHOLD_KEY = 
"dfs.namenode.name.cache.threshold";
   public static final int     DFS_NAMENODE_NAME_CACHE_THRESHOLD_DEFAULT = 10;
   public static final String  DFS_NAMENODE_LEGACY_OIV_IMAGE_DIR_KEY = 
"dfs.namenode.legacy-oiv-image.dir";