You are viewing a plain text version of this content. The canonical link for it is here.

Posted to hdfs-commits@hadoop.apache.org by to...@apache.org on 2011/12/17 01:12:06 UTC

svn commit: r1215355 - in /hadoop/common/branches/branch-0.23/hadoop-hdfs-project/hadoop-hdfs: CHANGES.txt pom.xml

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>