tree 8b29292686a4a57fad8fee55ec893d82436bc312
parent 87d1c6794422fc32cac01715ac485519766c72f1
parent 99bf2902b29c4ab910d5043fe7091f7df04c21fe
author Aaron Myers <atm@apache.org> 1330724608 +0000
committer Aaron Myers <atm@apache.org> 1330724608 +0000

Merge trunk into HA branch.


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