CHANGES.txt: Moving YARN-1884, YARN-3171, YARN-3740, YARN-3248, YARN-3544 to 2.6.1 given the backport.

(cherry picked from commit f3e5bc67661ebc7e14509f2a267131ae314699dc)
(cherry picked from commit 23f4cd1c5a1ccff86a0f2579cc6486d27e33fa59)

hadoop-yarn-project/CHANGES.txt

@@ -147,9 +147,6 @@ Release 2.7.1 - 2015-07-06
     YARN-3485. FairScheduler headroom calculation doesn't consider 
     maxResources for Fifo and FairShare policies. (kasha)
 
-    YARN-3544. Got back AM logs link on the RM web UI for a completed app.
-    (Xuan Gong via zjshen)
-
     YARN-3301. Fixed the format issue of the new RM attempt web page.
     (Xuan Gong via jianhe)
 
@@ -802,17 +799,11 @@ Release 2.7.0 - 2015-04-20
     YARN-3295. Fix documentation nits found in markdown conversion.
     (Masatake Iwasaki via ozawa)
 
-    YARN-1884. Added nodeHttpAddress into ContainerReport and fixed the link to NM
-    web page. (Xuan Gong via zjshen)
-
     YARN-3338. Exclude jline dependency from YARN. (Zhijie Shen via xgong)
 
     YARN-3154. Added additional APIs in LogAggregationContext to avoid aggregating
     running logs of application when rolling is enabled. (Xuan Gong via vinodkv)
 
-    YARN-3171. Sort by Application id, AppAttempt and ContainerID doesn't work
-    in ATS / RM web ui. (Naganarasimha G R via xgong)
-
     YARN-1453. [JDK8] Fix Javadoc errors caused by incorrect or illegal tags in 
     doc comments. (Akira AJISAKA, Andrew Purtell, and Allen Wittenauer via ozawa)
 
@@ -1058,9 +1049,21 @@ Release 2.6.1 - 2015-09-09
     YARN-4047. ClientRMService getApplications has high scheduler lock contention.
     (Jason Lowe via jianhe)
 
+    YARN-1884. Added nodeHttpAddress into ContainerReport and fixed the link to NM
+    web page. (Xuan Gong via zjshen)
+
+    YARN-3171. Sort by Application id, AppAttempt and ContainerID doesn't work
+    in ATS / RM web ui. (Naganarasimha G R via xgong)
+
+    YARN-3740. Fixed the typo in the configuration name:
+    APPLICATION_HISTORY_PREFIX_MAX_APPS. (Xuan Gong via zjshen)
+
     YARN-3248. Display count of nodes blacklisted by apps in the web UI.
     (Varun Vasudev via xgong)
 
+    YARN-3544. Got back AM logs link on the RM web UI for a completed app.
+    (Xuan Gong via zjshen)
+
 Release 2.6.0 - 2014-11-18
 
   INCOMPATIBLE CHANGES