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
..
aop/org/apache/hadoop/fi	MAPREDUCE-4447. Remove aop from cruft from the ant build. Contributed by Eli Collins	2012-07-16 19:09:33 +00:00
avro	HADOOP-7920. Remove a few more bits that are no longer required.	2011-12-14 21:57:55 +00:00
java/org/apache/hadoop	Merge remote-tracking branch 'apache/trunk' into HDFS-7285	2015-09-22 13:27:09 -07:00
proto	HADOOP-12325. RPC Metrics : Add the ability track and log slow RPCs. Contributed by Anu Engineer	2015-08-24 14:31:24 -07:00
resources	HADOOP-12384. Add '-direct' flag option for fs copy so that user can choose not to create '._COPYING_' file (Contributed by J.Andreina)	2015-09-08 19:11:18 +05:30
scripts	HADOOP-10854. unit tests for the shell scripts (aw)	2015-07-31 14:34:48 -07:00
all-tests	HADOOP-7560. Change src layout to be heirarchical. Contributed by Alejandro Abdelnur.	2011-08-25 00:14:24 +00:00
empty-file	HADOOP-7560. Change src layout to be heirarchical. Contributed by Alejandro Abdelnur.	2011-08-25 00:14:24 +00:00