Merging HADOOP-3755 into 0.18 branch.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/core/trunk@677379 13f79535-47bb-0310-9956-ffa450edef68

CHANGES.txt

@@ -120,8 +120,6 @@ Trunk (unreleased changes)
     HADOOP-3721. Refactor CompositeRecordReader and related mapred.join classes
     to make them clearer. (cdouglas)
 
-    HADOOP-3755. Update gridmix to work with HOD 0.4 (Runping Qi via cdouglas)
-
 Release 0.18.0 - Unreleased
 
   INCOMPATIBLE CHANGES
@@ -851,6 +849,8 @@ Release 0.18.0 - Unreleased
     HADOOP-3670. Fixes JobTracker to clear out split bytes when no longer 
     required. (Amareshwari Sriramadasu via ddas)
 
+    HADOOP-3755. Update gridmix to work with HOD 0.4 (Runping Qi via cdouglas)
+
 Release 0.17.2 - Unreleased
 
   BUG FIXES