2ca93d1fbf
Conflicts: hadoop-common-project/hadoop-common/CHANGES.txt hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt hadoop-mapreduce-project/CHANGES.txt Conflicts: hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt