HADOOP-3931. Merge -r 684918:684919 from branch 0.17 to branch 0.18 and trunk

as just a change in CHANGES.txt. The bug only occurred in 0.17.


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

CHANGES.txt

@@ -828,6 +828,10 @@ Release 0.17.2 - Unreleased
     HADOOP-3859. Allow the maximum number of xceivers in the data node to
     be configurable. (Johan Oskarsson via omalley)
 
+    HADOOP-3931. Fix corner case in the map-side sort that causes some values 
+    to be counted as too large and cause pre-mature spills to disk. Some values
+    will also bypass the combiner incorrectly. (cdouglas via omalley)
+
 Release 0.17.1 - 2008-06-23
 
   INCOMPATIBLE CHANGES