HDFS-2056. Merged r1134170 from trunk.


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