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

dev-support

HADOOP-9255. relnotes.py missing last jira (tgraves)

2013-01-28 19:18:10 +00:00

hadoop-assemblies

HADOOP-9260. Hadoop version may be not correct when starting name node or data node. Contributed by Chris Nauroth

2013-02-05 16:02:52 +00:00

hadoop-client

HDFS-3895. hadoop-client must include commons-cli (tucu)

2012-09-06 19:03:37 +00:00

hadoop-common-project

Merge trunk into HDFS-347 branch.

2013-02-16 01:12:07 +00:00

hadoop-dist

HADOOP-9097. Maven RAT plugin is not checking all source files (tgraves)

2013-01-14 14:37:12 +00:00

hadoop-hdfs-project

Merge trunk into branch.

2013-03-29 21:33:35 +00:00

hadoop-mapreduce-project

HADOOP-9304. remove addition of avro genreated-sources dirs to build. (tucu)

2013-02-14 18:48:14 +00:00

hadoop-maven-plugins

HADOOP-9117. replace protoc ant plugin exec with a maven plugin. (tucu)

2013-02-13 22:13:44 +00:00

hadoop-minicluster

Changed version in trunk to 3.0.0-SNAPSHOT.

2012-03-28 07:37:06 +00:00

hadoop-project

Merge trunk into HDFS-347 branch.

2013-02-16 01:12:07 +00:00

hadoop-project-dist

HADOOP-9190. packaging docs is broken. Contributed by Andy Isaacson.

2013-01-29 09:17:40 +00:00

hadoop-tools

HADOOP-9297. remove old record IO generation and tests. (tucu)

2013-02-14 04:27:07 +00:00

hadoop-yarn-project

HADOOP-9117. replace protoc ant plugin exec with a maven plugin. (tucu)

2013-02-13 22:13:44 +00:00

.gitattributes

HADOOP-8912. Add .gitattributes file to prevent CRLF and LF mismatches for source and text files. Contributed by Raja Aluri.

2012-10-12 04:55:30 +00:00

.gitignore

HDFS-2178. Contributing Hoop to HDFS, replacement for HDFS proxy with read/write capabilities. (tucu)

2011-12-08 19:25:28 +00:00

BUILDING.txt

HADOOP-9190. packaging docs is broken. Contributed by Andy Isaacson.

2013-01-29 09:17:40 +00:00

pom.xml

HADOOP-9247. Parametrize Clover generateXxx properties to make them re-definable via -D in mvn calls. Contributed by Ivan A. Veselovsky.

2013-01-25 20:53:17 +00:00

Description

No description provided

big-datahadoopjava

264 MiB

Languages

Java 92.9%

C++ 2.8%

C 1.8%

JavaScript 1.1%

Shell 0.5%

Other 0.6%