arp eb8284d50e Merge trunk into HDFS-6581 ...

Conflicts:
	hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/fsdataset/FsVolumeSpi.java
	hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/TestDirectoryScanner.java

2014-09-07 14:46:46 -07:00

..

hadoop-hdfs

Merge trunk into HDFS-6581

2014-09-07 14:46:46 -07:00

hadoop-hdfs-httpfs

Merge trunk into HDFS-6581

2014-09-05 21:36:25 -07:00

hadoop-hdfs-nfs

HDFS-6942. Fix typos in log messages. Contributed by Ray Chiang.

2014-09-02 16:22:18 -07:00

pom.xml

HDFS-4762 Provide HDFS based NFSv3 and Mountd implementation. Contributed by Brandon Li

2013-07-02 17:31:58 +00:00