Apache
/
hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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
This commit is contained in:
Vinod Kumar Vavilapalli 2014-01-28 20:50:39 +00:00
parent 1c8e403fdd
commit 65a9a46f2c
2 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hadoop-yarn-project/CHANGES.txt
View File

@ -30,6 +30,7 @@ Branch YARN-321: Generic ApplicationHistoryService
YARN-1007. Enhance History Reader interface for Containers. (Mayank Bansal via YARN-1007. Enhance History Reader interface for Containers. (Mayank Bansal via
devaraj) devaraj)
<<<<<<< .working
YARN-975. Added a file-system implementation for HistoryStorage. (Zhijie Shen YARN-975. Added a file-system implementation for HistoryStorage. (Zhijie Shen
via vinodkv) 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 YARN-1605. Fixed formatting issues in the new module on branch YARN-321. (Vinod
Kumar Vavilapalli via zjshen) Kumar Vavilapalli via zjshen)
YARN-1625. Fixed RAT warnings after YARN-321 merge. (Shinichi Yamashita via
vinodkv)
Release 2.4.0 - UNRELEASED Release 2.4.0 - UNRELEASED
INCOMPATIBLE CHANGES INCOMPATIBLE CHANGES

1
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/pom.xml
View File

@ -199,6 +199,7 @@
<exclude>src/main/resources/webapps/mapreduce/.keep</exclude> <exclude>src/main/resources/webapps/mapreduce/.keep</exclude>
<exclude>src/main/resources/webapps/jobhistory/.keep</exclude> <exclude>src/main/resources/webapps/jobhistory/.keep</exclude>
<exclude>src/main/resources/webapps/yarn/.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/cluster/.keep</exclude>
<exclude>src/main/resources/webapps/test/.keep</exclude> <exclude>src/main/resources/webapps/test/.keep</exclude>
<exclude>src/main/resources/webapps/proxy/.keep</exclude> <exclude>src/main/resources/webapps/proxy/.keep</exclude>