From 5e826c4b2870e071700eb9bf2bb073ba9fde8f6c Mon Sep 17 00:00:00 2001 From: Arun Murthy Date: Tue, 15 Jan 2013 15:44:31 +0000 Subject: [PATCH] Merge -c 1433461 from trunk to branch-2 to fix HDFS-4399. Fix RAT warnings by excluding images sub-dir in docs. Contributed by Thomas Graves. git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1433467 13f79535-47bb-0310-9956-ffa450edef68 --- hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt | 5 ++++- hadoop-hdfs-project/hadoop-hdfs/pom.xml | 1 + 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt index 8286568c436..d81bd052f7c 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt +++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt @@ -516,7 +516,7 @@ Release 2.0.3-alpha - Unreleased HDFS-4017. Unclosed FileInputStream in GetJournalEditServlet (Chao Shi via todd) - HDFS-4351. In BlockPlacementPolicyDefault.chooseTarget(..), numOfReplicas + HDFS-4351. In BlockPlacementPolicyDefault.chooseTarget(..), numOfReplicas needs to be updated when avoiding stale nodes. (Andrew Wang via szetszwo) HDFS-4100. Fix all findbug security warings. (Liang Xie via eli) @@ -524,6 +524,9 @@ Release 2.0.3-alpha - Unreleased HDFS-2908. Add apache license header for StorageReport.java. (Brandon Li via tgraves) + HDFS-4399. Fix RAT warnings by excluding images sub-dir in docs. (Thomas + Graves via acmurthy) + Release 2.0.2-alpha - 2012-09-07 INCOMPATIBLE CHANGES diff --git a/hadoop-hdfs-project/hadoop-hdfs/pom.xml b/hadoop-hdfs-project/hadoop-hdfs/pom.xml index ef4643fe5f3..45780902373 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/pom.xml +++ b/hadoop-hdfs-project/hadoop-hdfs/pom.xml @@ -516,6 +516,7 @@ http://maven.apache.org/xsd/maven-4.0.0.xsd"> src/main/webapps/datanode/robots.txt src/main/docs/releasenotes.html src/contrib/** + src/site/resources/images/*