tree dce56e67b2a270b0abee7c99c1034a5482d58bae
parent c45c8ee720fe4aff918d83972d57764a83f2891d
parent 5e94420456ddd756e80512753a6575506ebef05e
author Aaron Myers <atm@apache.org> 1365807928 +0000
committer Aaron Myers <atm@apache.org> 1365807928 +0000

Merge trunk into the HDFS-347 branch.


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