tree 03877046025fb0c25a92a5b452397ca8e907f522
parent 59801391400f3fa0ed1f029b7af75627d3288f22
parent f19465f72f57a3226725fc62f8f5711c95147f32
author Tsz-wo Sze <szetszwo@apache.org> 1368139599 +0000
committer Tsz-wo Sze <szetszwo@apache.org> 1368139599 +0000

Merge r1480440 through r1480820 from trunk.


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