Andrew Wang c4194399d3 Merge HDFS-4949 changes from trunk to branch-2. %!s(int64=11) %!d(string=hai) anos
..
main c4194399d3 Merge HDFS-4949 changes from trunk to branch-2. %!s(int64=11) %!d(string=hai) anos
test 2977cbfc83 Merge -c 1496741 from trunk to branch-2 to fix MAPREDUCE-5326. Added version to shuffle header. Contributed by Zhijie Shen. %!s(int64=12) %!d(string=hai) anos