Todd Lipcon bbb24fbf5d Merge trunk into branch. ... Conflicts resolved: C hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestShortCircuitLocalRead.java ! C hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/SocketCache.java C hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/DFSInputStream.java C hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/DFSClient.java C hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/DataNode.java C hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/BlockReaderLocal.java (thanks to Colin for help resolving) git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-347@1462652 13f79535-47bb-0310-9956-ffa450edef68		2013-03-29 21:33:35 +00:00
..
hadoop-hdfs	Merge trunk into branch.	2013-03-29 21:33:35 +00:00
hadoop-hdfs-httpfs	HDFS-4456. Add concat to HttpFS and WebHDFS REST API docs. (plamenj2003 via tucu)	2013-02-01 19:42:06 +00:00
pom.xml	HDFS-4385. Maven RAT plugin is not checking all source files (tgraves)	2013-01-14 14:36:40 +00:00