hadoop/hadoop-common-project/hadoop-common
Zhe Zhang 6c17d31528 Merge remote-tracking branch 'apache/trunk' into HDFS-7285
Conflicts:
	hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/DFSOutputStream.java
	hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/DataStreamer.java

Change-Id: I53ec1c426dc988d6c4a2c87b00caef49c4057010
2015-09-30 08:39:13 -07:00
..
dev-support HADOOP-11889. Make checkstyle runnable from root project (Gera Shegalov via jeagles) 2015-05-01 13:11:50 -05:00
src Merge remote-tracking branch 'apache/trunk' into HDFS-7285 2015-09-30 08:39:13 -07:00
CHANGES-HDFS-EC-7285.txt HADOOP-12060. Fix ByteBuffer usage for raw erasure coders. Contributed by Kai Zheng. 2015-07-20 10:15:14 -07:00
CHANGES.txt HADOOP-12448. TestTextCommand: use mkdirs rather than mkdir to create test directory. (Contributed by Colin Patrick McCabe and Chris Nauroth) 2015-09-30 10:56:22 +08:00
HadoopCommon.cmake HADOOP-12036. Consolidate all of the cmake extensions in one directory (alanburlison via cmccabe) 2015-06-26 12:32:31 -07:00
HadoopJNI.cmake HADOOP-12036. Consolidate all of the cmake extensions in one directory (alanburlison via cmccabe) 2015-06-26 12:32:31 -07:00
pom.xml HDFS-9080. Update htrace version to 4.0.1 (cmccabe) 2015-09-28 07:42:12 -07:00