From 65a9a46f2cc5203e4a5eb4f2a73ed495b1b914e1 Mon Sep 17 00:00:00 2001 From: Vinod Kumar Vavilapalli Date: Tue, 28 Jan 2014 20:50:39 +0000 Subject: [PATCH] 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 | 4 ++++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/pom.xml | 1 + 2 files changed, 5 insertions(+) diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt index 7d83c8f9408..87dbf32b5cc 100644 --- a/hadoop-yarn-project/CHANGES.txt +++ b/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 diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/pom.xml b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/pom.xml index 17fe43d57b1..57173b264b4 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/pom.xml +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/pom.xml @@ -199,6 +199,7 @@ src/main/resources/webapps/mapreduce/.keep src/main/resources/webapps/jobhistory/.keep src/main/resources/webapps/yarn/.keep + src/main/resources/webapps/applicationhistory/.keep src/main/resources/webapps/cluster/.keep src/main/resources/webapps/test/.keep src/main/resources/webapps/proxy/.keep