Merging change r1134138 for HDFS-2030 from trunk


git-svn-id: https://svn.apache.org/repos/asf/hadoop/hdfs/branches/yahoo-merge@1134143 13f79535-47bb-0310-9956-ffa450edef68
5 files changed