From c1fd273580c5bc5900ec3845b5a7c7f44e579d19 Mon Sep 17 00:00:00 2001
From: Alejandro Abdelnur <tucu@apache.org>
Date: Thu, 26 Jan 2012 18:16:27 +0000
Subject: [PATCH] Merge -r 1236337:1236338 from trunk to branch. FIXES:
 HDFS-2837

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1236339 13f79535-47bb-0310-9956-ffa450edef68
---
 hadoop-hdfs-project/dev-support/test-patch.properties | 2 +-
 hadoop-hdfs-project/hadoop-hdfs-httpfs/pom.xml        | 5 +++++
 hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt           | 2 ++
 3 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/hadoop-hdfs-project/dev-support/test-patch.properties b/hadoop-hdfs-project/dev-support/test-patch.properties
index df85aa6e280..9365482b277 100644
--- a/hadoop-hdfs-project/dev-support/test-patch.properties
+++ b/hadoop-hdfs-project/dev-support/test-patch.properties
@@ -18,4 +18,4 @@
 
 OK_RELEASEAUDIT_WARNINGS=0
 OK_FINDBUGS_WARNINGS=0
-OK_JAVADOC_WARNINGS=2
+OK_JAVADOC_WARNINGS=0
diff --git a/hadoop-hdfs-project/hadoop-hdfs-httpfs/pom.xml b/hadoop-hdfs-project/hadoop-hdfs-httpfs/pom.xml
index a97537780c1..002ba5e2fd5 100644
--- a/hadoop-hdfs-project/hadoop-hdfs-httpfs/pom.xml
+++ b/hadoop-hdfs-project/hadoop-hdfs-httpfs/pom.xml
@@ -53,6 +53,11 @@
       <artifactId>mockito-all</artifactId>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>org.apache.hadoop</groupId>
+      <artifactId>hadoop-annotations</artifactId>
+      <scope>provided</scope>
+    </dependency>
     <dependency>
       <groupId>com.sun.jersey</groupId>
       <artifactId>jersey-server</artifactId>
diff --git a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
index 490800e7705..8b4bfab8f6f 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
+++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
@@ -186,6 +186,8 @@ Release 0.23.1 - UNRELEASED
 
     HDFS-2836. HttpFSServer still has 2 javadoc warnings in trunk (revans2 via tucu)
 
+    HDFS-2837. mvn javadoc:javadoc not seeing LimitedPrivate class (revans2 via tucu)
+
 Release 0.23.0 - 2011-11-01 
 
   INCOMPATIBLE CHANGES