svn merge -c 1514768 FIXES: Update CHANGES.txt to reflect merge of MR-1981 to branch-2.1-beta

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1514769 13f79535-47bb-0310-9956-ffa450edef68

hadoop-mapreduce-project/CHANGES.txt

@@ -25,9 +25,6 @@ Release 2.3.0 - UNRELEASED
 
   OPTIMIZATIONS
 
-    MAPREDUCE-1981. Improve getSplits performance by using listLocatedStatus
-    (Hairong Kuang and Jason Lowe via jlowe)
-
   BUG FIXES
 
     MAPREDUCE-5316. job -list-attempt-ids command does not handle illegal
@@ -55,6 +52,9 @@ Release 2.1.1-beta - UNRELEASED
     MAPREDUCE-5462. In map-side sort, swap entire meta entries instead of
     indexes for better cache performance. (Sandy Ryza)
 
+    MAPREDUCE-1981. Improve getSplits performance by using listLocatedStatus
+    (Hairong Kuang and Jason Lowe via jlowe)
+
   BUG FIXES
 
     MAPREDUCE-5385. Fixed a bug with JobContext getCacheFiles API. (Omkar Vinit