Brandon Li 48a9215359 HDFS-5662. Merging change r1552131 from trunk %!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 48a9215359 HDFS-5662. Merging change r1552131 from trunk %!s(int64=11) %!d(string=hai) anos
resources 53f2a1efe5 HDFS-5502. Merge change r1542438 from trunk. %!s(int64=11) %!d(string=hai) anos