Merge trunk into HA branch.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-1623@1220631 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
parent
8ff28f4549
commit
35206c716e