tree 8b29292686a4a57fad8fee55ec893d82436bc312
parent ffa527138bfbb56064112b3bb23ee39f73e8cf40
author Aaron Myers <atm@apache.org> 1330729747 +0000
committer Aaron Myers <atm@apache.org> 1330729747 +0000

Merge trunk into HA branch.


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