tree fcc8195561c0a6b606a3b171e078d8043021cbbb
parent 4e2a3935b1daf9f9cd6c9705312cbeb972cea822
parent f105784d6a28d2a0cedb619f0951de93d995e9da
author Tsz-wo Sze <szetszwo@apache.org> 1340866778 +0000
committer Tsz-wo Sze <szetszwo@apache.org> 1340866778 +0000

Merge r1346682 through r1354801 from trunk.


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