Brandon Li 531605ef28 HDFS-5649. Merging change 1556405 from trunk 11 年之前
..
main 531605ef28 HDFS-5649. Merging change 1556405 from trunk 11 年之前
test db432fe76e HDFS-5563. Merging change r1546233 from trunk 11 年之前