tree 9b211f2df20dd27640c9256c794c527d11d25c15
parent 5d29338017fb8ebe8626002c1ca670842968ca4a
parent 40464fba22bac99d0e5b79674152aa5dfba99483
author Jing Zhao <jing9@apache.org> 1393957346 +0000
committer Jing Zhao <jing9@apache.org> 1393957346 +0000

Merging r1573814 through r1574170 from trunk.

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