tree 6d03345f52095d9e4f975121fdfd5db8fd93e5e6
parent 8b91ae1cfa9f72ed92c047af63884593187fac95
parent 67cbc289e4f7cb6124554b5f7700a70737254fc4
author Tsz-wo Sze <szetszwo@apache.org> 1338941858 +0000
committer Tsz-wo Sze <szetszwo@apache.org> 1338941858 +0000

Merge r1337003 through r1346681 from trunk.


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-3092@1346682 13f79535-47bb-0310-9956-ffa450edef68