YARN-1625. Fixed RAT warnings after YARN-321 merge. Contributed by Shinichi Yamashita.

svn merge --ignore-ancestry -c 1561458 ../../trunk/


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

hadoop-yarn-project/CHANGES.txt

@@ -30,6 +30,7 @@ Branch YARN-321: Generic ApplicationHistoryService
   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 ApplicationHistoryService
   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

hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/pom.xml

@@ -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>