Author: tucu
Date: Wed May 16 18:20:20 2012
New Revision: 1339300

URL: http://svn.apache.org/viewvc?rev=1339300&view=rev
Log:
Merge -r 1339297:1339298 from trunk to branch. FIXES: HADOOP-8400

Modified:
    
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-auth/src/main/java/org/apache/hadoop/security/authentication/util/KerberosName.java
    
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt

Modified: 
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-auth/src/main/java/org/apache/hadoop/security/authentication/util/KerberosName.java
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-common-project/hadoop-auth/src/main/java/org/apache/hadoop/security/authentication/util/KerberosName.java?rev=1339300&r1=1339299&r2=1339300&view=diff
==============================================================================
--- 
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-auth/src/main/java/org/apache/hadoop/security/authentication/util/KerberosName.java
 (original)
+++ 
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-auth/src/main/java/org/apache/hadoop/security/authentication/util/KerberosName.java
 Wed May 16 18:20:20 2012
@@ -84,7 +84,7 @@ public class KerberosName {
     try {
       defaultRealm = KerberosUtil.getDefaultRealm();
     } catch (Exception ke) {
-        LOG.warn("Kerberos krb5 configuration not found, setting default realm 
to empty");
+        LOG.debug("Kerberos krb5 configuration not found, setting default 
realm to empty");
         defaultRealm="";
     }
   }

Modified: 
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt?rev=1339300&r1=1339299&r2=1339300&view=diff
==============================================================================
--- 
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt 
(original)
+++ 
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt 
Wed May 16 18:20:20 2012
@@ -31,6 +31,8 @@ Release 2.0.1-alpha - UNRELEASED
 
     HADOOP-8316. Audit logging should be disabled by default. (eli)
 
+    HADOOP-8400. All commands warn "Kerberos krb5 configuration not found" 
when security is not enabled. (tucu)
+
 Release 2.0.0-alpha - UNRELEASED
 
   INCOMPATIBLE CHANGES


Reply via email to