You are viewing a plain text version of this content. The canonical link for it is here.
Posted to yarn-commits@hadoop.apache.org by vi...@apache.org on 2014/02/04 00:38:25 UTC

svn commit: r1564131 - /hadoop/common/branches/branch-2/hadoop-yarn-project/CHANGES.txt

Author: vinodkv
Date: Mon Feb  3 23:38:24 2014
New Revision: 1564131

URL: http://svn.apache.org/r1564131
Log:
Fixing YARN CHANGES.txt merge issue in the last commit.

Modified:
    hadoop/common/branches/branch-2/hadoop-yarn-project/CHANGES.txt

Modified: hadoop/common/branches/branch-2/hadoop-yarn-project/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-yarn-project/CHANGES.txt?rev=1564131&r1=1564130&r2=1564131&view=diff
==============================================================================
--- hadoop/common/branches/branch-2/hadoop-yarn-project/CHANGES.txt (original)
+++ hadoop/common/branches/branch-2/hadoop-yarn-project/CHANGES.txt Mon Feb  3 23:38:24 2014
@@ -124,35 +124,6 @@ Release 2.4.0 - UNRELEASED
   
     YARN-1595. Made enabling history service configurable and fixed test failures on
     branch YARN-321. (Vinod Kumar Vavilapalli via zjshen)
-  OPTIMIZATIONS
-
-  BUG FIXES
-
-    YARN-935. Correcting pom.xml to build applicationhistoryserver module
-    successfully. (Zhijie Shen via vinodkv)
-  
-    YARN-962. Fixed bug in application-history proto file and renamed it be just
-    a client proto file. (Zhijie Shen via vinodkv)
-  
-    YARN-984. Renamed the incorrectly named applicationhistoryservice.records.pb.impl
-    package to be applicationhistoryservice.records.impl.pb. (Devaraj K via vinodkv)
-  
-    YARN-1534. Fixed failure of test TestAHSWebApp. (Shinichi Yamashita via vinodkv)
-  
-    YARN-1555. Fixed test failures in applicationhistoryservice.* (Vinod Kumar 
-    Vavilapalli via mayank)
-  
-    YARN-1594. Updated pom.xml of applicationhistoryservice sub-project according to
-    YARN-888. (Vinod Kumar Vavilapalli via zjshen)
-  
-    YARN-1596. Fixed Javadoc warnings on branch YARN-321. (Vinod Kumar Vavilapalli
-    via zjshen)
-  
-    YARN-1597. Fixed Findbugs warnings on branch YARN-321. (Vinod Kumar Vavilapalli
-    via zjshen)
-  
-    YARN-1595. Made enabling history service configurable and fixed test failures on
-    branch YARN-321. (Vinod Kumar Vavilapalli via zjshen)
   
     YARN-1605. Fixed formatting issues in the new module on branch YARN-321. (Vinod
     Kumar Vavilapalli via zjshen)