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 2013/08/23 10:43:28 UTC
svn commit: r1516749 - in
/hadoop/common/branches/branch-2.1-beta/hadoop-common-project: ./
hadoop-auth/
hadoop-auth/src/main/java/org/apache/hadoop/security/authentication/client/KerberosAuthenticator.java
hadoop-common/ hadoop-common/CHANGES.txt
Author: szetszwo
Date: Fri Aug 23 08:43:28 2013
New Revision: 1516749
URL: http://svn.apache.org/r1516749
Log:
svn merge -c 1516745 from branch-2 for HADOOP-9899. Remove the debug message, added by HADOOP-8855, from KerberosAuthenticator.
Modified:
hadoop/common/branches/branch-2.1-beta/hadoop-common-project/ (props changed)
hadoop/common/branches/branch-2.1-beta/hadoop-common-project/hadoop-auth/ (props changed)
hadoop/common/branches/branch-2.1-beta/hadoop-common-project/hadoop-auth/src/main/java/org/apache/hadoop/security/authentication/client/KerberosAuthenticator.java
hadoop/common/branches/branch-2.1-beta/hadoop-common-project/hadoop-common/ (props changed)
hadoop/common/branches/branch-2.1-beta/hadoop-common-project/hadoop-common/CHANGES.txt (contents, props changed)
Propchange: hadoop/common/branches/branch-2.1-beta/hadoop-common-project/
------------------------------------------------------------------------------
Merged /hadoop/common/branches/branch-2/hadoop-common-project:r1516745
Propchange: hadoop/common/branches/branch-2.1-beta/hadoop-common-project/hadoop-auth/
------------------------------------------------------------------------------
Merged /hadoop/common/branches/branch-2/hadoop-common-project/hadoop-auth:r1516745
Modified: hadoop/common/branches/branch-2.1-beta/hadoop-common-project/hadoop-auth/src/main/java/org/apache/hadoop/security/authentication/client/KerberosAuthenticator.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2.1-beta/hadoop-common-project/hadoop-auth/src/main/java/org/apache/hadoop/security/authentication/client/KerberosAuthenticator.java?rev=1516749&r1=1516748&r2=1516749&view=diff
==============================================================================
--- hadoop/common/branches/branch-2.1-beta/hadoop-common-project/hadoop-auth/src/main/java/org/apache/hadoop/security/authentication/client/KerberosAuthenticator.java (original)
+++ hadoop/common/branches/branch-2.1-beta/hadoop-common-project/hadoop-auth/src/main/java/org/apache/hadoop/security/authentication/client/KerberosAuthenticator.java Fri Aug 23 08:43:28 2013
@@ -308,7 +308,6 @@ public class KerberosAuthenticator imple
* Sends the Kerberos token to the server.
*/
private void sendToken(byte[] outToken) throws IOException, AuthenticationException {
- new Exception("sendToken").printStackTrace(System.out);
String token = base64.encodeToString(outToken);
conn = (HttpURLConnection) url.openConnection();
if (connConfigurator != null) {
Propchange: hadoop/common/branches/branch-2.1-beta/hadoop-common-project/hadoop-common/
------------------------------------------------------------------------------
Merged /hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common:r1516745
Modified: hadoop/common/branches/branch-2.1-beta/hadoop-common-project/hadoop-common/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2.1-beta/hadoop-common-project/hadoop-common/CHANGES.txt?rev=1516749&r1=1516748&r2=1516749&view=diff
==============================================================================
--- hadoop/common/branches/branch-2.1-beta/hadoop-common-project/hadoop-common/CHANGES.txt (original)
+++ hadoop/common/branches/branch-2.1-beta/hadoop-common-project/hadoop-common/CHANGES.txt Fri Aug 23 08:43:28 2013
@@ -78,6 +78,9 @@ Release 2.1.1-beta - UNRELEASED
HADOOP-9880. SASL changes from HADOOP-9421 breaks Secure HA NN. (daryn via
jing9)
+ HADOOP-9899. Remove the debug message, added by HADOOP-8855, from
+ KerberosAuthenticator. (szetszwo)
+
Release 2.1.0-beta - 2013-08-22
INCOMPATIBLE CHANGES
Propchange: hadoop/common/branches/branch-2.1-beta/hadoop-common-project/hadoop-common/CHANGES.txt
------------------------------------------------------------------------------
Merged /hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt:r1516745