Merging r1133181 for HDFS-1875 from trunk


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