Clone
Arpit Agarwal
committed
on 01 Oct 14
Merge branch 'trunk' into HDFS-6581
Conflicts:
hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSDirec… Show more
Merge branch 'trunk' into HDFS-6581

Conflicts:

        hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSDirectory.java

        hadoop-hdfs-project/hadoop-hdfs/src/test/resources/editsStored.xml

Show less

trunk + 113 more