tree a31112ddd1b28329278ab46ee7f3ee58e315a976
parent 93511259ba1c3df222b6542ad2269f292eb5f442
parent a9d80ae59d15dc35ae5975e07251bdbabe083d29
author Arpit Agarwal <arp@apache.org> 1387418627 +0000
committer Arpit Agarwal <arp@apache.org> 1387418627 +0000

Merge forward from trunk to branch HDFS-2832

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