big-data/hadoop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
15,188 Commits 2 Branches 2 Tags 264 MiB
b31e1951e0
Commit Graph

258 Commits

Author SHA1 Message Date
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
Aaron Myers
f61581501a Merge trunk into HDFS-347 branch. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-347@1446832 13f79535-47bb-0310-9956-ffa450edef68
 2013-02-16 01:12:07 +00:00
Aaron Myers
aa92072b54 HDFS-4453. Make a simple doc to describe the usage and design of the shortcircuit read feature. Contributed by Colin Patrick McCabe. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-347@1444963 13f79535-47bb-0310-9956-ffa450edef68
 2013-02-11 21:10:23 +00:00
Alejandro Abdelnur
bbdae834d2 HDFS-4456. Add concat to HttpFS and WebHDFS REST API docs. (plamenj2003 via tucu) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1441603 13f79535-47bb-0310-9956-ffa450edef68
 2013-02-01 19:42:06 +00:00
Aaron Myers
73066dc958 HADOOP-9221. Convert remaining xdocs to APT. Contributed by Andy Isaacson. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1440245 13f79535-47bb-0310-9956-ffa450edef68
 2013-01-30 01:52:14 +00:00
Alejandro Abdelnur
b324a6134e HADOOP-8427. Convert Forrest docs to APT, incremental. (adi2 via tucu) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1424459 13f79535-47bb-0310-9956-ffa450edef68
 2012-12-20 13:41:43 +00:00
Thomas White
42f4691ead Add new files missed from HADOOP-8860 commit. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1408288 13f79535-47bb-0310-9956-ffa450edef68
 2012-11-12 13:54:27 +00:00
Alejandro Abdelnur
9d5205aadd HADOOP-8860. Split MapReduce and YARN sections in documentation navigation. (tomwhite via tucu) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1407658 13f79535-47bb-0310-9956-ffa450edef68
 2012-11-09 21:44:00 +00:00