5ca4f0f82e
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1463300 13f79535-47bb-0310-9956-ffa450edef68 (cherry picked from commit 7c65dbb9385567fe1d8e280b81ecb97b109d18a8) Conflicts: hadoop-yarn-project/CHANGES.txt