Zhe Zhang 1080c37300 Merge remote-tracking branch 'apache/trunk' into HDFS-7285 ... Conflicts: hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/DFSConfigKeys.java hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/BlockManager.java hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/DataNode.java hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/Namesystem.java hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/DFSTestUtil.java Change-Id: I8511c4d64b0959e79129febc179845a3892fedcc		2015-09-22 13:27:09 -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-22 13:27:09 -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-12428. Fix inconsistency between log-level guards and statements. Contributed by Jagadesh Kiran N and Jackie Chang.	2015-09-22 12:54:29 +09: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	HADOOP-12367. Move TestFileUtil's test resources to resources folder. (wang via yliu)	2015-09-01 16:20:56 +08:00