37d68c060f
svn merge -c 1224970 --ignore-ancestry ../../trunk/ git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1224971 13f79535-47bb-0310-9956-ffa450edef68