arp a186d514bd Merge branch 'trunk' into HDFS-6581 ... Conflicts: hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSDirectory.java		2014-09-17 15:03:55 -07:00
..
hadoop-hdfs	Merge branch 'trunk' into HDFS-6581	2014-09-17 15:03:55 -07:00
hadoop-hdfs-httpfs	Merge branch 'trunk' into HDFS-6581	2014-09-16 14:32:57 -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