arp e0d7fb48fb Merge branch 'trunk' into HDFS-6581 ... Conflicts: hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/DFSOutputStream.java hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/protocol/datatransfer/Receiver.java		2014-09-16 14:32:57 -07:00
..
dev-support	HDFS-6634. inotify in HDFS. Contributed by James Thomas.	2014-09-02 14:02:29 -07:00
src	Merge branch 'trunk' into HDFS-6581	2014-09-16 14:32:57 -07:00
CHANGES-HDFS-6581.txt	HDFS-7066. LazyWriter#evictBlocks misses a null check for replicaState. (Contributed by Xiaoyu Yao)	2014-09-15 15:28:17 -07:00
CHANGES.txt	HDFS-6880. Adding tracing to DataNode data transfer protocol (iwasakims via cmccabe)	2014-09-16 13:59:32 -07:00
pom.xml	HDFS-6979. hdfs.dll not produce .pdb files. Contributed by Chris Nauroth.	2014-09-05 11:03:58 -07:00