Brandon Li 531605ef28 HDFS-5649. Merging change 1556405 from trunk 11 年之前
..
main 531605ef28 HDFS-5649. Merging change 1556405 from trunk 11 年之前
test 9f2f36cadb HDFS-5587. Merging change r1548028 from trunk 11 年之前