svn commit: r1325052 - in /hadoop/common/branches/HDFS-3092/hadoop-common-project/hadoop-common: ./ src/main/docs/ src/main/java/ src/main/java/org/apache/hadoop/ipc/ src/main/java/org/apache/hadoop/net/ src/test/core/

[szetszwo]

Author: szetszwo
Date: Wed Apr 11 22:51:10 2012
New Revision: 1325052

URL: http://svn.apache.org/viewvc?rev=1325052&view=rev
Log:
Merge r1311518 through r1325051 from trunk.

Modified:
    
hadoop/common/branches/HDFS-3092/hadoop-common-project/hadoop-common/CHANGES.txt
   (contents, props changed)
    
hadoop/common/branches/HDFS-3092/hadoop-common-project/hadoop-common/src/main/docs/
   (props changed)
    
hadoop/common/branches/HDFS-3092/hadoop-common-project/hadoop-common/src/main/java/
   (props changed)
    
hadoop/common/branches/HDFS-3092/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/ProtobufRpcEngine.java
    
hadoop/common/branches/HDFS-3092/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/net/NetUtils.java
    
hadoop/common/branches/HDFS-3092/hadoop-common-project/hadoop-common/src/test/core/
   (props changed)

Modified: 
hadoop/common/branches/HDFS-3092/hadoop-common-project/hadoop-common/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-3092/hadoop-common-project/hadoop-common/CHANGES.txt?rev=1325052&r1=1325051&r2=1325052&view=diff
==============================================================================
--- 
hadoop/common/branches/HDFS-3092/hadoop-common-project/hadoop-common/CHANGES.txt
 (original)
+++ 
hadoop/common/branches/HDFS-3092/hadoop-common-project/hadoop-common/CHANGES.txt
 Wed Apr 11 22:51:10 2012
@@ -58,6 +58,9 @@ Trunk (unreleased changes)
     HADOOP-7757. Test file reference count is at least 3x actual value (Jon
     Eagles via bobby)
 
+    HADOOP-8147. test-patch should run tests with -fn to avoid masking test
+    failures (Robert Evans via tgraves)
+
   BUG FIXES
 
     HADOOP-8177. MBeans shouldn't try to register when it fails to create 
MBeanName.
@@ -338,6 +341,11 @@ Release 2.0.0 - UNRELEASED 
     HADOOP-8261. Har file system doesn't deal with FS URIs with a host but no
     port. (atm)
 
+    HADOOP-8263. Stringification of IPC calls not useful (todd)
+
+    HADOOP-8264. Remove irritating double double quotes in front of hostname
+    (Bernd Fondermann via bobby)
+
   BREAKDOWN OF HADOOP-7454 SUBTASKS
 
     HADOOP-7455. HA: Introduce HA Service Protocol Interface. (suresh)

Propchange: 
hadoop/common/branches/HDFS-3092/hadoop-common-project/hadoop-common/CHANGES.txt
------------------------------------------------------------------------------
  Merged 
/hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt:r1311518-1325051

Propchange: 
hadoop/common/branches/HDFS-3092/hadoop-common-project/hadoop-common/src/main/docs/
------------------------------------------------------------------------------
  Merged 
/hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/docs:r1311518-1325051

Propchange: 
hadoop/common/branches/HDFS-3092/hadoop-common-project/hadoop-common/src/main/java/
------------------------------------------------------------------------------
  Merged 
/hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java:r1311518-1325051

Modified: 
hadoop/common/branches/HDFS-3092/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/ProtobufRpcEngine.java
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-3092/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/ProtobufRpcEngine.java?rev=1325052&r1=1325051&r2=1325052&view=diff
==============================================================================
--- 
hadoop/common/branches/HDFS-3092/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/ProtobufRpcEngine.java
 (original)
+++ 
hadoop/common/branches/HDFS-3092/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/ProtobufRpcEngine.java
 Wed Apr 11 22:51:10 2012
@@ -268,6 +268,12 @@ public class ProtobufRpcEngine implement
       in.readFully(bytes);
       message = HadoopRpcRequestProto.parseFrom(bytes);
     }
+    
+    @Override
+    public String toString() {
+      return message.getDeclaringClassProtocolName() + "." +
+          message.getMethodName();
+    }
   }
 
   /**

Modified: 
hadoop/common/branches/HDFS-3092/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/net/NetUtils.java
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-3092/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/net/NetUtils.java?rev=1325052&r1=1325051&r2=1325052&view=diff
==============================================================================
--- 
hadoop/common/branches/HDFS-3092/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/net/NetUtils.java
 (original)
+++ 
hadoop/common/branches/HDFS-3092/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/net/NetUtils.java
 Wed Apr 11 22:51:10 2012
@@ -782,7 +782,7 @@ public class NetUtils {
     hostDetails.append("local host is: ")
         .append(quoteHost(localHost))
         .append("; ");
-    hostDetails.append("destination host is: \"").append(quoteHost(destHost))
+    hostDetails.append("destination host is: ").append(quoteHost(destHost))
         .append(":")
         .append(destPort).append("; ");
     return hostDetails.toString();

Propchange: 
hadoop/common/branches/HDFS-3092/hadoop-common-project/hadoop-common/src/test/core/
------------------------------------------------------------------------------
  Merged 
/hadoop/common/trunk/hadoop-common-project/hadoop-common/src/test/core:r1311518-1325051