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 br...@apache.org on 2013/07/03 20:14:33 UTC
svn commit: r1499503 - in
/hadoop/common/branches/branch-2.1.0-beta/hadoop-common-project: ./
hadoop-common/ hadoop-nfs/ hadoop-nfs/src/ hadoop-nfs/src/main/
hadoop-nfs/src/main/java/ hadoop-nfs/src/main/java/org/
hadoop-nfs/src/main/java/org/apache/ h...
Author: brandonli
Date: Wed Jul 3 18:14:32 2013
New Revision: 1499503
URL: http://svn.apache.org/r1499503
Log:
HADOOP-9509. Merging change r1499156 from branch-2
Added:
hadoop/common/branches/branch-2.1.0-beta/hadoop-common-project/hadoop-nfs/ (props changed)
- copied from r1499156, hadoop/common/branches/branch-2/hadoop-common-project/hadoop-nfs/
hadoop/common/branches/branch-2.1.0-beta/hadoop-common-project/hadoop-nfs/README.txt
- copied unchanged from r1499156, hadoop/common/branches/branch-2/hadoop-common-project/hadoop-nfs/README.txt
hadoop/common/branches/branch-2.1.0-beta/hadoop-common-project/hadoop-nfs/pom.xml
- copied, changed from r1499156, hadoop/common/branches/branch-2/hadoop-common-project/hadoop-nfs/pom.xml
hadoop/common/branches/branch-2.1.0-beta/hadoop-common-project/hadoop-nfs/src/
- copied from r1499156, hadoop/common/branches/branch-2/hadoop-common-project/hadoop-nfs/src/
hadoop/common/branches/branch-2.1.0-beta/hadoop-common-project/hadoop-nfs/src/main/
- copied from r1499156, hadoop/common/branches/branch-2/hadoop-common-project/hadoop-nfs/src/main/
hadoop/common/branches/branch-2.1.0-beta/hadoop-common-project/hadoop-nfs/src/main/java/
- copied from r1499156, hadoop/common/branches/branch-2/hadoop-common-project/hadoop-nfs/src/main/java/
hadoop/common/branches/branch-2.1.0-beta/hadoop-common-project/hadoop-nfs/src/main/java/org/
- copied from r1499156, hadoop/common/branches/branch-2/hadoop-common-project/hadoop-nfs/src/main/java/org/
hadoop/common/branches/branch-2.1.0-beta/hadoop-common-project/hadoop-nfs/src/main/java/org/apache/
- copied from r1499156, hadoop/common/branches/branch-2/hadoop-common-project/hadoop-nfs/src/main/java/org/apache/
hadoop/common/branches/branch-2.1.0-beta/hadoop-common-project/hadoop-nfs/src/main/java/org/apache/hadoop/
- copied from r1499156, hadoop/common/branches/branch-2/hadoop-common-project/hadoop-nfs/src/main/java/org/apache/hadoop/
hadoop/common/branches/branch-2.1.0-beta/hadoop-common-project/hadoop-nfs/src/main/java/org/apache/hadoop/oncrpc/
- copied from r1499156, hadoop/common/branches/branch-2/hadoop-common-project/hadoop-nfs/src/main/java/org/apache/hadoop/oncrpc/
hadoop/common/branches/branch-2.1.0-beta/hadoop-common-project/hadoop-nfs/src/main/java/org/apache/hadoop/oncrpc/RegistrationClient.java
- copied unchanged from r1499156, hadoop/common/branches/branch-2/hadoop-common-project/hadoop-nfs/src/main/java/org/apache/hadoop/oncrpc/RegistrationClient.java
hadoop/common/branches/branch-2.1.0-beta/hadoop-common-project/hadoop-nfs/src/main/java/org/apache/hadoop/oncrpc/RpcAcceptedReply.java
- copied unchanged from r1499156, hadoop/common/branches/branch-2/hadoop-common-project/hadoop-nfs/src/main/java/org/apache/hadoop/oncrpc/RpcAcceptedReply.java
hadoop/common/branches/branch-2.1.0-beta/hadoop-common-project/hadoop-nfs/src/main/java/org/apache/hadoop/oncrpc/RpcAuthInfo.java
- copied unchanged from r1499156, hadoop/common/branches/branch-2/hadoop-common-project/hadoop-nfs/src/main/java/org/apache/hadoop/oncrpc/RpcAuthInfo.java
hadoop/common/branches/branch-2.1.0-beta/hadoop-common-project/hadoop-nfs/src/main/java/org/apache/hadoop/oncrpc/RpcAuthSys.java
- copied unchanged from r1499156, hadoop/common/branches/branch-2/hadoop-common-project/hadoop-nfs/src/main/java/org/apache/hadoop/oncrpc/RpcAuthSys.java
hadoop/common/branches/branch-2.1.0-beta/hadoop-common-project/hadoop-nfs/src/main/java/org/apache/hadoop/oncrpc/RpcCall.java
- copied unchanged from r1499156, hadoop/common/branches/branch-2/hadoop-common-project/hadoop-nfs/src/main/java/org/apache/hadoop/oncrpc/RpcCall.java
hadoop/common/branches/branch-2.1.0-beta/hadoop-common-project/hadoop-nfs/src/main/java/org/apache/hadoop/oncrpc/RpcCallCache.java
- copied unchanged from r1499156, hadoop/common/branches/branch-2/hadoop-common-project/hadoop-nfs/src/main/java/org/apache/hadoop/oncrpc/RpcCallCache.java
hadoop/common/branches/branch-2.1.0-beta/hadoop-common-project/hadoop-nfs/src/main/java/org/apache/hadoop/oncrpc/RpcDeniedReply.java
- copied unchanged from r1499156, hadoop/common/branches/branch-2/hadoop-common-project/hadoop-nfs/src/main/java/org/apache/hadoop/oncrpc/RpcDeniedReply.java
hadoop/common/branches/branch-2.1.0-beta/hadoop-common-project/hadoop-nfs/src/main/java/org/apache/hadoop/oncrpc/RpcFrameDecoder.java
- copied unchanged from r1499156, hadoop/common/branches/branch-2/hadoop-common-project/hadoop-nfs/src/main/java/org/apache/hadoop/oncrpc/RpcFrameDecoder.java
hadoop/common/branches/branch-2.1.0-beta/hadoop-common-project/hadoop-nfs/src/main/java/org/apache/hadoop/oncrpc/RpcMessage.java
- copied unchanged from r1499156, hadoop/common/branches/branch-2/hadoop-common-project/hadoop-nfs/src/main/java/org/apache/hadoop/oncrpc/RpcMessage.java
hadoop/common/branches/branch-2.1.0-beta/hadoop-common-project/hadoop-nfs/src/main/java/org/apache/hadoop/oncrpc/RpcProgram.java
- copied unchanged from r1499156, hadoop/common/branches/branch-2/hadoop-common-project/hadoop-nfs/src/main/java/org/apache/hadoop/oncrpc/RpcProgram.java
hadoop/common/branches/branch-2.1.0-beta/hadoop-common-project/hadoop-nfs/src/main/java/org/apache/hadoop/oncrpc/RpcReply.java
- copied unchanged from r1499156, hadoop/common/branches/branch-2/hadoop-common-project/hadoop-nfs/src/main/java/org/apache/hadoop/oncrpc/RpcReply.java
hadoop/common/branches/branch-2.1.0-beta/hadoop-common-project/hadoop-nfs/src/main/java/org/apache/hadoop/oncrpc/RpcUtil.java
- copied unchanged from r1499156, hadoop/common/branches/branch-2/hadoop-common-project/hadoop-nfs/src/main/java/org/apache/hadoop/oncrpc/RpcUtil.java
hadoop/common/branches/branch-2.1.0-beta/hadoop-common-project/hadoop-nfs/src/main/java/org/apache/hadoop/oncrpc/SimpleTcpClient.java
- copied unchanged from r1499156, hadoop/common/branches/branch-2/hadoop-common-project/hadoop-nfs/src/main/java/org/apache/hadoop/oncrpc/SimpleTcpClient.java
hadoop/common/branches/branch-2.1.0-beta/hadoop-common-project/hadoop-nfs/src/main/java/org/apache/hadoop/oncrpc/SimpleTcpClientHandler.java
- copied unchanged from r1499156, hadoop/common/branches/branch-2/hadoop-common-project/hadoop-nfs/src/main/java/org/apache/hadoop/oncrpc/SimpleTcpClientHandler.java
hadoop/common/branches/branch-2.1.0-beta/hadoop-common-project/hadoop-nfs/src/main/java/org/apache/hadoop/oncrpc/SimpleTcpServer.java
- copied unchanged from r1499156, hadoop/common/branches/branch-2/hadoop-common-project/hadoop-nfs/src/main/java/org/apache/hadoop/oncrpc/SimpleTcpServer.java
hadoop/common/branches/branch-2.1.0-beta/hadoop-common-project/hadoop-nfs/src/main/java/org/apache/hadoop/oncrpc/SimpleTcpServerHandler.java
- copied unchanged from r1499156, hadoop/common/branches/branch-2/hadoop-common-project/hadoop-nfs/src/main/java/org/apache/hadoop/oncrpc/SimpleTcpServerHandler.java
hadoop/common/branches/branch-2.1.0-beta/hadoop-common-project/hadoop-nfs/src/main/java/org/apache/hadoop/oncrpc/SimpleUdpClient.java
- copied unchanged from r1499156, hadoop/common/branches/branch-2/hadoop-common-project/hadoop-nfs/src/main/java/org/apache/hadoop/oncrpc/SimpleUdpClient.java
hadoop/common/branches/branch-2.1.0-beta/hadoop-common-project/hadoop-nfs/src/main/java/org/apache/hadoop/oncrpc/SimpleUdpServer.java
- copied unchanged from r1499156, hadoop/common/branches/branch-2/hadoop-common-project/hadoop-nfs/src/main/java/org/apache/hadoop/oncrpc/SimpleUdpServer.java
hadoop/common/branches/branch-2.1.0-beta/hadoop-common-project/hadoop-nfs/src/main/java/org/apache/hadoop/oncrpc/SimpleUdpServerHandler.java
- copied unchanged from r1499156, hadoop/common/branches/branch-2/hadoop-common-project/hadoop-nfs/src/main/java/org/apache/hadoop/oncrpc/SimpleUdpServerHandler.java
hadoop/common/branches/branch-2.1.0-beta/hadoop-common-project/hadoop-nfs/src/main/java/org/apache/hadoop/oncrpc/XDR.java
- copied unchanged from r1499156, hadoop/common/branches/branch-2/hadoop-common-project/hadoop-nfs/src/main/java/org/apache/hadoop/oncrpc/XDR.java
hadoop/common/branches/branch-2.1.0-beta/hadoop-common-project/hadoop-nfs/src/main/java/org/apache/hadoop/portmap/
- copied from r1499156, hadoop/common/branches/branch-2/hadoop-common-project/hadoop-nfs/src/main/java/org/apache/hadoop/portmap/
hadoop/common/branches/branch-2.1.0-beta/hadoop-common-project/hadoop-nfs/src/main/java/org/apache/hadoop/portmap/Portmap.java
- copied unchanged from r1499156, hadoop/common/branches/branch-2/hadoop-common-project/hadoop-nfs/src/main/java/org/apache/hadoop/portmap/Portmap.java
hadoop/common/branches/branch-2.1.0-beta/hadoop-common-project/hadoop-nfs/src/main/java/org/apache/hadoop/portmap/PortmapInterface.java
- copied unchanged from r1499156, hadoop/common/branches/branch-2/hadoop-common-project/hadoop-nfs/src/main/java/org/apache/hadoop/portmap/PortmapInterface.java
hadoop/common/branches/branch-2.1.0-beta/hadoop-common-project/hadoop-nfs/src/main/java/org/apache/hadoop/portmap/PortmapMapping.java
- copied unchanged from r1499156, hadoop/common/branches/branch-2/hadoop-common-project/hadoop-nfs/src/main/java/org/apache/hadoop/portmap/PortmapMapping.java
hadoop/common/branches/branch-2.1.0-beta/hadoop-common-project/hadoop-nfs/src/main/java/org/apache/hadoop/portmap/PortmapRequest.java
- copied unchanged from r1499156, hadoop/common/branches/branch-2/hadoop-common-project/hadoop-nfs/src/main/java/org/apache/hadoop/portmap/PortmapRequest.java
hadoop/common/branches/branch-2.1.0-beta/hadoop-common-project/hadoop-nfs/src/main/java/org/apache/hadoop/portmap/PortmapResponse.java
- copied unchanged from r1499156, hadoop/common/branches/branch-2/hadoop-common-project/hadoop-nfs/src/main/java/org/apache/hadoop/portmap/PortmapResponse.java
hadoop/common/branches/branch-2.1.0-beta/hadoop-common-project/hadoop-nfs/src/main/java/org/apache/hadoop/portmap/RpcProgramPortmap.java
- copied unchanged from r1499156, hadoop/common/branches/branch-2/hadoop-common-project/hadoop-nfs/src/main/java/org/apache/hadoop/portmap/RpcProgramPortmap.java
hadoop/common/branches/branch-2.1.0-beta/hadoop-common-project/hadoop-nfs/src/test/
- copied from r1499156, hadoop/common/branches/branch-2/hadoop-common-project/hadoop-nfs/src/test/
hadoop/common/branches/branch-2.1.0-beta/hadoop-common-project/hadoop-nfs/src/test/java/
- copied from r1499156, hadoop/common/branches/branch-2/hadoop-common-project/hadoop-nfs/src/test/java/
hadoop/common/branches/branch-2.1.0-beta/hadoop-common-project/hadoop-nfs/src/test/java/org/
- copied from r1499156, hadoop/common/branches/branch-2/hadoop-common-project/hadoop-nfs/src/test/java/org/
hadoop/common/branches/branch-2.1.0-beta/hadoop-common-project/hadoop-nfs/src/test/java/org/apache/
- copied from r1499156, hadoop/common/branches/branch-2/hadoop-common-project/hadoop-nfs/src/test/java/org/apache/
hadoop/common/branches/branch-2.1.0-beta/hadoop-common-project/hadoop-nfs/src/test/java/org/apache/hadoop/
- copied from r1499156, hadoop/common/branches/branch-2/hadoop-common-project/hadoop-nfs/src/test/java/org/apache/hadoop/
hadoop/common/branches/branch-2.1.0-beta/hadoop-common-project/hadoop-nfs/src/test/java/org/apache/hadoop/oncrpc/
- copied from r1499156, hadoop/common/branches/branch-2/hadoop-common-project/hadoop-nfs/src/test/java/org/apache/hadoop/oncrpc/
hadoop/common/branches/branch-2.1.0-beta/hadoop-common-project/hadoop-nfs/src/test/java/org/apache/hadoop/oncrpc/TestFrameDecoder.java
- copied unchanged from r1499156, hadoop/common/branches/branch-2/hadoop-common-project/hadoop-nfs/src/test/java/org/apache/hadoop/oncrpc/TestFrameDecoder.java
hadoop/common/branches/branch-2.1.0-beta/hadoop-common-project/hadoop-nfs/src/test/java/org/apache/hadoop/oncrpc/TestRpcAcceptedReply.java
- copied unchanged from r1499156, hadoop/common/branches/branch-2/hadoop-common-project/hadoop-nfs/src/test/java/org/apache/hadoop/oncrpc/TestRpcAcceptedReply.java
hadoop/common/branches/branch-2.1.0-beta/hadoop-common-project/hadoop-nfs/src/test/java/org/apache/hadoop/oncrpc/TestRpcAuthInfo.java
- copied unchanged from r1499156, hadoop/common/branches/branch-2/hadoop-common-project/hadoop-nfs/src/test/java/org/apache/hadoop/oncrpc/TestRpcAuthInfo.java
hadoop/common/branches/branch-2.1.0-beta/hadoop-common-project/hadoop-nfs/src/test/java/org/apache/hadoop/oncrpc/TestRpcAuthSys.java
- copied unchanged from r1499156, hadoop/common/branches/branch-2/hadoop-common-project/hadoop-nfs/src/test/java/org/apache/hadoop/oncrpc/TestRpcAuthSys.java
hadoop/common/branches/branch-2.1.0-beta/hadoop-common-project/hadoop-nfs/src/test/java/org/apache/hadoop/oncrpc/TestRpcCall.java
- copied unchanged from r1499156, hadoop/common/branches/branch-2/hadoop-common-project/hadoop-nfs/src/test/java/org/apache/hadoop/oncrpc/TestRpcCall.java
hadoop/common/branches/branch-2.1.0-beta/hadoop-common-project/hadoop-nfs/src/test/java/org/apache/hadoop/oncrpc/TestRpcCallCache.java
- copied unchanged from r1499156, hadoop/common/branches/branch-2/hadoop-common-project/hadoop-nfs/src/test/java/org/apache/hadoop/oncrpc/TestRpcCallCache.java
hadoop/common/branches/branch-2.1.0-beta/hadoop-common-project/hadoop-nfs/src/test/java/org/apache/hadoop/oncrpc/TestRpcDeniedReply.java
- copied unchanged from r1499156, hadoop/common/branches/branch-2/hadoop-common-project/hadoop-nfs/src/test/java/org/apache/hadoop/oncrpc/TestRpcDeniedReply.java
hadoop/common/branches/branch-2.1.0-beta/hadoop-common-project/hadoop-nfs/src/test/java/org/apache/hadoop/oncrpc/TestRpcMessage.java
- copied unchanged from r1499156, hadoop/common/branches/branch-2/hadoop-common-project/hadoop-nfs/src/test/java/org/apache/hadoop/oncrpc/TestRpcMessage.java
hadoop/common/branches/branch-2.1.0-beta/hadoop-common-project/hadoop-nfs/src/test/java/org/apache/hadoop/oncrpc/TestRpcReply.java
- copied unchanged from r1499156, hadoop/common/branches/branch-2/hadoop-common-project/hadoop-nfs/src/test/java/org/apache/hadoop/oncrpc/TestRpcReply.java
hadoop/common/branches/branch-2.1.0-beta/hadoop-common-project/hadoop-nfs/src/test/java/org/apache/hadoop/oncrpc/TestXDR.java
- copied unchanged from r1499156, hadoop/common/branches/branch-2/hadoop-common-project/hadoop-nfs/src/test/java/org/apache/hadoop/oncrpc/TestXDR.java
Modified:
hadoop/common/branches/branch-2.1.0-beta/hadoop-common-project/hadoop-common/CHANGES.txt
hadoop/common/branches/branch-2.1.0-beta/hadoop-common-project/pom.xml
Modified: hadoop/common/branches/branch-2.1.0-beta/hadoop-common-project/hadoop-common/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2.1.0-beta/hadoop-common-project/hadoop-common/CHANGES.txt?rev=1499503&r1=1499502&r2=1499503&view=diff
==============================================================================
--- hadoop/common/branches/branch-2.1.0-beta/hadoop-common-project/hadoop-common/CHANGES.txt (original)
+++ hadoop/common/branches/branch-2.1.0-beta/hadoop-common-project/hadoop-common/CHANGES.txt Wed Jul 3 18:14:32 2013
@@ -55,6 +55,8 @@ Release 2.1.0-beta - 2013-07-02
HADOOP-8470. Add NetworkTopologyWithNodeGroup, a 4-layer implementation
of NetworkTopology. (Junping Du via szetszwo)
+ HADOOP-9509. Implement ONCRPC and XDR. (brandonli)
+
IMPROVEMENTS
HADOOP-9253. Capture ulimit info in the logs at service start time.
Propchange: hadoop/common/branches/branch-2.1.0-beta/hadoop-common-project/hadoop-nfs/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Wed Jul 3 18:14:32 2013
@@ -0,0 +1,5 @@
+.classpath
+.git
+.project
+.settings
+target
Copied: hadoop/common/branches/branch-2.1.0-beta/hadoop-common-project/hadoop-nfs/pom.xml (from r1499156, hadoop/common/branches/branch-2/hadoop-common-project/hadoop-nfs/pom.xml)
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2.1.0-beta/hadoop-common-project/hadoop-nfs/pom.xml?p2=hadoop/common/branches/branch-2.1.0-beta/hadoop-common-project/hadoop-nfs/pom.xml&p1=hadoop/common/branches/branch-2/hadoop-common-project/hadoop-nfs/pom.xml&r1=1499156&r2=1499503&rev=1499503&view=diff
==============================================================================
--- hadoop/common/branches/branch-2/hadoop-common-project/hadoop-nfs/pom.xml (original)
+++ hadoop/common/branches/branch-2.1.0-beta/hadoop-common-project/hadoop-nfs/pom.xml Wed Jul 3 18:14:32 2013
@@ -20,12 +20,12 @@
<parent>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-project</artifactId>
- <version>3.0.0-SNAPSHOT</version>
+ <version>2.1.0-beta</version>
<relativePath>../../hadoop-project</relativePath>
</parent>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-nfs</artifactId>
- <version>3.0.0-SNAPSHOT</version>
+ <version>2.1.0-beta</version>
<packaging>jar</packaging>
<name>Apache Hadoop NFS</name>
Modified: hadoop/common/branches/branch-2.1.0-beta/hadoop-common-project/pom.xml
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2.1.0-beta/hadoop-common-project/pom.xml?rev=1499503&r1=1499502&r2=1499503&view=diff
==============================================================================
--- hadoop/common/branches/branch-2.1.0-beta/hadoop-common-project/pom.xml (original)
+++ hadoop/common/branches/branch-2.1.0-beta/hadoop-common-project/pom.xml Wed Jul 3 18:14:32 2013
@@ -35,6 +35,7 @@
<module>hadoop-auth-examples</module>
<module>hadoop-common</module>
<module>hadoop-annotations</module>
+ <module>hadoop-nfs</module>
</modules>
<build>