Haohui Mai a6d24fb94d Merge r1574999 from branch-2. %!s(int64=11) %!d(string=hai) anos
..
aop 4c66560499 HDFS-4491. Merging change r1520479 and r1520482 from trunk to branch-2. %!s(int64=12) %!d(string=hai) anos
java a6d24fb94d Merge r1574999 from branch-2. %!s(int64=11) %!d(string=hai) anos
resources 1e92a7a460 Merge r1574794 from branch-2. %!s(int64=11) %!d(string=hai) anos