YARN-1883. Merged into branch-2.4 also.

svn merge --ignore-ancestry -c 1582862 ../../trunk/ onto branch-2.4.
Fixed CHANGES.txt entries too.


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

hadoop-yarn-project/CHANGES.txt

@@ -35,9 +35,6 @@ Release 2.5.0 - UNRELEASED
     YARN-1136. Replace junit.framework.Assert with org.junit.Assert (Chen He
     via jeagles)
 
-    YARN-1883. TestRMAdminService fails due to inconsistent entries in
-    UserGroups (Mit Desai via jeagles)
-
     YARN-1889. In Fair Scheduler, avoid creating objects on each call to
     AppSchedulable comparator (Hong Zhiguo via Sandy Ryza)
 
@@ -76,6 +73,9 @@ Release 2.4.1 - UNRELEASED
 
     YARN-1905. TestProcfsBasedProcessTree must only run on Linux. (cnauroth)
 
+    YARN-1883. TestRMAdminService fails due to inconsistent entries in
+    UserGroups (Mit Desai via jeagles)
+
     YARN-1908. Fixed DistributedShell to not fail in secure clusters. (Vinod
     Kumar Vavilapalli and Jian He via vinodkv)