Author: tgraves Date: Thu Jun 21 15:02:16 2012 New Revision: 1352551 URL: http://svn.apache.org/viewvc?rev=1352551&view=rev Log: merge -r 1352549:1352550 from trunk. FIXES: MAPREDUCE-4320
Modified: hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt Modified: hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt?rev=1352551&r1=1352550&r2=1352551&view=diff ============================================================================== --- hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt (original) +++ hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt Thu Jun 21 15:02:16 2012 @@ -480,6 +480,8 @@ Release 0.23.3 - UNRELEASED MAPREDUCE-3889. job client tries to use /tasklog interface, but that doesn't exist anymore (Devaraj K via bobby) + MAPREDUCE-4320. gridmix mainClass wrong in pom.xml (tgraves) + Release 0.23.2 - UNRELEASED INCOMPATIBLE CHANGES