hadoop-common-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From a..@apache.org
Subject svn commit: r1579388 - in /hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop: ipc/Server.java security/SaslPropertiesResolver.java
Date Wed, 19 Mar 2014 20:23:29 GMT
Author: arp
Date: Wed Mar 19 20:23:28 2014
New Revision: 1579388

URL: http://svn.apache.org/r1579388
Log:
HADOOP-10221. Merging r1579387 from trunk to branch-2.

Added:
    hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/SaslPropertiesResolver.java
      - copied unchanged from r1579387, hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/SaslPropertiesResolver.java
Modified:
    hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/Server.java

Modified: hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/Server.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/Server.java?rev=1579388&r1=1579387&r2=1579388&view=diff
==============================================================================
--- hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/Server.java
(original)
+++ hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/Server.java
Wed Mar 19 20:23:28 2014
@@ -1570,7 +1570,7 @@ public abstract class Server {
         throws IOException, InterruptedException {
       final Map<String,?> saslProps =
                   saslPropsResolver.getServerProperties(addr);
-      return new SaslRpcServer(authMethod).create(this ,saslProps, secretManager);
+      return new SaslRpcServer(authMethod).create(this, saslProps, secretManager);
     }
     
     /**



Mime
View raw message