(cherry picked from commit ce0462129f) (cherry picked from commit 9855e884cb)
ce0462129f
9855e884cb
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1563044 13f79535-47bb-0310-9956-ffa450edef68