Return-Path: 
 <hdfs-commits-return-2603-apmail-hadoop-hdfs-commits-archive=hadoop.apache.org@hadoop.apache.org>
X-Original-To: apmail-hadoop-hdfs-commits-archive@minotaur.apache.org
Delivered-To: apmail-hadoop-hdfs-commits-archive@minotaur.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by minotaur.apache.org (Postfix) with SMTP id 175389C44
	for <apmail-hadoop-hdfs-commits-archive@minotaur.apache.org>;
 Sat, 17 Dec 2011 00:12:28 +0000 (UTC)
Received: (qmail 1830 invoked by uid 500); 17 Dec 2011 00:12:28 -0000
Delivered-To: apmail-hadoop-hdfs-commits-archive@hadoop.apache.org
Received: (qmail 1801 invoked by uid 500); 17 Dec 2011 00:12:27 -0000
Mailing-List: contact hdfs-commits-help@hadoop.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:hdfs-commits-help@hadoop.apache.org>
List-Unsubscribe: <mailto:hdfs-commits-unsubscribe@hadoop.apache.org>
List-Post: <mailto:hdfs-commits@hadoop.apache.org>
List-Id: <hdfs-commits.hadoop.apache.org>
Reply-To: hdfs-dev@hadoop.apache.org
Delivered-To: mailing list hdfs-commits@hadoop.apache.org
Received: (qmail 1793 invoked by uid 99); 17 Dec 2011 00:12:27 -0000
Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136)
    by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 17 Dec 2011 00:12:27 +0000
X-ASF-Spam-Status: No, hits=-2000.0 required=5.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4)
    by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 17 Dec 2011 00:12:26 +0000
Received: from eris.apache.org (localhost [127.0.0.1])
	by eris.apache.org (Postfix) with ESMTP id 4C54A23888E7;
	Sat, 17 Dec 2011 00:12:06 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1215355 - in
 /hadoop/common/branches/branch-0.23/hadoop-hdfs-project/hadoop-hdfs:
 CHANGES.txt pom.xml
Date: Sat, 17 Dec 2011 00:12:06 -0000
To: hdfs-commits@hadoop.apache.org
From: tomwhite@apache.org
X-Mailer: svnmailer-1.0.8-patched
Message-Id: <20111217001206.4C54A23888E7@eris.apache.org>

Author: tomwhite
Date: Sat Dec 17 00:12:05 2011
New Revision: 1215355

URL: http://svn.apache.org/viewvc?rev=1215355&view=rev
Log:
Merge -r 1215353:1215354 from trunk to branch-0.23. Fixes: HDFS-2640.

Modified:
    hadoop/common/branches/branch-0.23/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
    hadoop/common/branches/branch-0.23/hadoop-hdfs-project/hadoop-hdfs/pom.xml

Modified: hadoop/common/branches/branch-0.23/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt?rev=1215355&r1=1215354&r2=1215355&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.23/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt (original)
+++ hadoop/common/branches/branch-0.23/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt Sat Dec 17 00:12:05 2011
@@ -102,6 +102,8 @@ Release 0.23.1 - UNRELEASED
     HDFS-2649. eclipse:eclipse build fails for hadoop-hdfs-httpfs.
     (Jason Lowe via eli)
 
+    HDFS-2640. Javadoc generation hangs. (tomwhite)
+
 Release 0.23.0 - 2011-11-01 
 
   INCOMPATIBLE CHANGES

Modified: hadoop/common/branches/branch-0.23/hadoop-hdfs-project/hadoop-hdfs/pom.xml
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-hdfs-project/hadoop-hdfs/pom.xml?rev=1215355&r1=1215354&r2=1215355&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.23/hadoop-hdfs-project/hadoop-hdfs/pom.xml (original)
+++ hadoop/common/branches/branch-0.23/hadoop-hdfs-project/hadoop-hdfs/pom.xml Sat Dec 17 00:12:05 2011
@@ -321,6 +321,13 @@
         </executions>
       </plugin>
       <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-javadoc-plugin</artifactId>
+        <configuration>
+          <excludePackageNames>org.apache.hadoop.hdfs.protocol.proto</excludePackageNames>
+        </configuration>
+      </plugin>
+      <plugin>
         <groupId>org.apache.rat</groupId>
         <artifactId>apache-rat-plugin</artifactId>
         <configuration>