| commit | 794fa069dd01488dc89dc54fbfc03d319116b49d | [log] [tgz] |
|---|---|---|
| author | Todd Lipcon <todd@apache.org> | Fri Mar 29 21:33:35 2013 +0000 |
| committer | Todd Lipcon <todd@apache.org> | Fri Mar 29 21:33:35 2013 +0000 |
| tree | 02227efa58a3b931185f4a6375ceefc23c006cd8 | |
| parent | 77bc111e6b19e9b33f4e8f926583cab8a7c650b7 [diff] |
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