tree 9e7a942a35b2513cd3bb03cd12920af4d28d3886
parent 70fc5cf01c9274c2afddac51f4999166d81d4e11
parent 33c16f2a24fc70e038a7aa48c83e80cd3e6d867f
author Todd Lipcon <todd@apache.org> 1349936066 +0000
committer Todd Lipcon <todd@apache.org> 1349936066 +0000

Merge trunk into branch


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