Zhe Zhang 8fd5520246 Merge remote-tracking branch 'apache/trunk' into HDFS-7285 ... Conflicts: hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/DFSClient.java hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/DFSOutputStream.java hadoop-hdfs-project/hadoop-hdfs-client/src/main/proto/hdfs.proto 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/DFSUtil.java hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/protocolPB/PBHelper.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/FSDirStatAndListingOp.java hadoop-hdfs-project/hadoop-hdfs/src/main/proto/DatanodeProtocol.proto hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/blockmanagement/TestBlockTokenWithDFS.java hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestFsck.java Change-Id: Ic7946c4ea35bed587fe879ce58b959b25ecc0823		2015-09-29 01:39:16 -07:00
..
dev-support	HDFS-8053. Move DFSIn/OutputStream and related classes to hadoop-hdfs-client. Contributed by Mingliang Liu.	2015-09-26 11:08:25 -07:00
src	Merge remote-tracking branch 'apache/trunk' into HDFS-7285	2015-09-29 01:39:16 -07:00
.gitattributes	HDFS-7172. Test data files may be checked out of git with incorrect line endings, causing test failures in TestHDFSCLI. Contributed by Chris Nauroth.	2014-10-01 10:46:33 -07:00
CHANGES-HDFS-EC-7285.txt	HDFS-9040. Erasure coding: coordinate data streamers in DFSStripedOutputStream. Contributed by Jing Zhao and Walter Su.	2015-09-28 14:40:27 -07:00
CHANGES.txt	HDFS-9092. Nfs silently drops overlapping write requests and causes data copying to fail. Contributed by Yongjun Zhang.	2015-09-28 18:45:00 -07:00
pom.xml	HDFS-9080. Update htrace version to 4.0.1 (cmccabe)	2015-09-28 07:42:12 -07:00