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
..
apt	Merge trunk into branch.	2013-03-29 21:33:35 +00:00
resources	HADOOP-8427. Convert Forrest docs to APT, incremental. (adi2 via tucu)	2012-12-20 13:41:43 +00:00
site.xml	Add new files missed from HADOOP-8860 commit.	2012-11-12 13:54:27 +00:00