hadoop-yarn-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From vino...@apache.org
Subject svn commit: r1562225 - in /hadoop/common/branches/branch-2/hadoop-yarn-project: CHANGES.txt hadoop-yarn/hadoop-yarn-common/pom.xml
Date Tue, 28 Jan 2014 20:50:40 GMT
Author: vinodkv
Date: Tue Jan 28 20:50:39 2014
New Revision: 1562225

URL: http://svn.apache.org/r1562225
Log:
YARN-1625. Fixed RAT warnings after YARN-321 merge. Contributed by Shinichi Yamashita.
svn merge --ignore-ancestry -c 1561458 ../../trunk/

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

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=1562225&r1=1562224&r2=1562225&view=diff
==============================================================================
--- hadoop/common/branches/branch-2/hadoop-yarn-project/CHANGES.txt (original)
+++ hadoop/common/branches/branch-2/hadoop-yarn-project/CHANGES.txt Tue Jan 28 20:50:39 2014
@@ -30,6 +30,7 @@ Branch YARN-321: Generic ApplicationHist
   YARN-1007. Enhance History Reader interface for Containers. (Mayank Bansal via
   devaraj)
 
+<<<<<<< .working
   YARN-975. Added a file-system implementation for HistoryStorage. (Zhijie Shen
   via vinodkv)
 
@@ -90,6 +91,9 @@ Branch YARN-321: Generic ApplicationHist
   YARN-1605. Fixed formatting issues in the new module on branch YARN-321. (Vinod
   Kumar Vavilapalli via zjshen)
 
+  YARN-1625. Fixed RAT warnings after YARN-321 merge. (Shinichi Yamashita via
+  vinodkv)
+
 Release 2.4.0 - UNRELEASED
 
   INCOMPATIBLE CHANGES

Modified: hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/pom.xml
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/pom.xml?rev=1562225&r1=1562224&r2=1562225&view=diff
==============================================================================
--- hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/pom.xml
(original)
+++ hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/pom.xml
Tue Jan 28 20:50:39 2014
@@ -199,6 +199,7 @@
             <exclude>src/main/resources/webapps/mapreduce/.keep</exclude>
             <exclude>src/main/resources/webapps/jobhistory/.keep</exclude>
             <exclude>src/main/resources/webapps/yarn/.keep</exclude>
+            <exclude>src/main/resources/webapps/applicationhistory/.keep</exclude>
             <exclude>src/main/resources/webapps/cluster/.keep</exclude>
             <exclude>src/main/resources/webapps/test/.keep</exclude>
             <exclude>src/main/resources/webapps/proxy/.keep</exclude>



Mime
View raw message