svn merge -c 1467120 FIXES: MAPREDUCE-5059. Change average merge time on Job overview page to be the time delta between the end of the shuffle and the start of the reduce. Contributed by Omkar Vinit Joshi


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1483885 13f79535-47bb-0310-9956-ffa450edef68
Merge remote branch 'origin/branch-0.23' into branch-0.23-gd
Merge remote branch 'origin/branch-0.23-gd' into fb-YAHOO-215-branch-0.23-gd