tree 9c9fb49a49b7a4793e1c0041eead197fd99930fc
parent 45ffc3bff66ae6f708b8c6864ddabe1500202423
parent 60eca33e83869bd8171cdf735d8f0a1de3b4b90d
author Jing Zhao <jing9@apache.org> 1391817239 +0000
committer Jing Zhao <jing9@apache.org> 1391817239 +0000

Merging r1565757 through r1565853 from trunk

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