tree eeabbec8832a343ed4ffe6282c33f3e36076c3cf
parent 366488b385497d68c14e397eb20438392fdad1b9
author Hairong Kuang <hairong@apache.org> 1238198933 +0000
committer Hairong Kuang <hairong@apache.org> 1238198933 +0000

Merge -r 759397:759398 from main to 0.18

git-svn-id: https://svn.apache.org/repos/asf/hadoop/core/branches/branch-0.18@759404 13f79535-47bb-0310-9956-ffa450edef68