hadoop-common-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From acmur...@apache.org
Subject svn commit: r589551 - in /lucene/hadoop/branches/branch-0.15: CHANGES.txt src/java/org/apache/hadoop/conf/Configuration.java src/java/org/apache/hadoop/io/WritableComparable.java src/java/org/apache/hadoop/mapred/Mapper.java
Date Mon, 29 Oct 2007 09:02:51 GMT
Author: acmurthy
Date: Mon Oct 29 02:02:50 2007
New Revision: 589551

URL: http://svn.apache.org/viewvc?rev=589551&view=rev
Log:
Merge -r 588599:588600 and 589547:589548 from trunk to branch-0.15 to fix HADOOP-2103.

Modified:
    lucene/hadoop/branches/branch-0.15/CHANGES.txt
    lucene/hadoop/branches/branch-0.15/src/java/org/apache/hadoop/conf/Configuration.java
    lucene/hadoop/branches/branch-0.15/src/java/org/apache/hadoop/io/WritableComparable.java
    lucene/hadoop/branches/branch-0.15/src/java/org/apache/hadoop/mapred/Mapper.java

Modified: lucene/hadoop/branches/branch-0.15/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/hadoop/branches/branch-0.15/CHANGES.txt?rev=589551&r1=589550&r2=589551&view=diff
==============================================================================
--- lucene/hadoop/branches/branch-0.15/CHANGES.txt (original)
+++ lucene/hadoop/branches/branch-0.15/CHANGES.txt Mon Oct 29 02:02:50 2007
@@ -333,6 +333,9 @@
     to the superceding ToolRunner to ensure it picks up the appropriate
     configuration resources. (Dennis Kubes and Enis Soztutar via acmurthy) 
  
+    HADOOP-2103.  Fix minor javadoc bugs introduce by HADOOP-2046. (Nigel
+    Daley via acmurthy) 
+
   IMPROVEMENTS
 
     HADOOP-1908. Restructure data node code so that block sending and 

Modified: lucene/hadoop/branches/branch-0.15/src/java/org/apache/hadoop/conf/Configuration.java
URL: http://svn.apache.org/viewvc/lucene/hadoop/branches/branch-0.15/src/java/org/apache/hadoop/conf/Configuration.java?rev=589551&r1=589550&r2=589551&view=diff
==============================================================================
--- lucene/hadoop/branches/branch-0.15/src/java/org/apache/hadoop/conf/Configuration.java
(original)
+++ lucene/hadoop/branches/branch-0.15/src/java/org/apache/hadoop/conf/Configuration.java
Mon Oct 29 02:02:50 2007
@@ -220,7 +220,7 @@
    * Add a configuration resource. 
    * 
    * The properties of this resource will override properties of previously 
-   * added resources, unless they were marked <a href="#Final>final</a>. 
+   * added resources, unless they were marked <a href="#Final">final</a>. 
    * 
    * @param name resource to be added, the classpath is examined for a file 
    *             with that name.
@@ -233,7 +233,7 @@
    * Add a configuration resource. 
    * 
    * The properties of this resource will override properties of previously 
-   * added resources, unless they were marked <a href="#Final>final</a>. 
+   * added resources, unless they were marked <a href="#Final">final</a>. 
    * 
    * @param url url of the resource to be added, the local filesystem is 
    *            examined directly to find the resource, without referring to 
@@ -247,7 +247,7 @@
    * Add a configuration resource. 
    * 
    * The properties of this resource will override properties of previously 
-   * added resources, unless they were marked <a href="#Final>final</a>. 
+   * added resources, unless they were marked <a href="#Final">final</a>. 
    * 
    * @param file file-path of resource to be added, the local filesystem is
    *             examined directly to find the resource, without referring to 

Modified: lucene/hadoop/branches/branch-0.15/src/java/org/apache/hadoop/io/WritableComparable.java
URL: http://svn.apache.org/viewvc/lucene/hadoop/branches/branch-0.15/src/java/org/apache/hadoop/io/WritableComparable.java?rev=589551&r1=589550&r2=589551&view=diff
==============================================================================
--- lucene/hadoop/branches/branch-0.15/src/java/org/apache/hadoop/io/WritableComparable.java
(original)
+++ lucene/hadoop/branches/branch-0.15/src/java/org/apache/hadoop/io/WritableComparable.java
Mon Oct 29 02:02:50 2007
@@ -46,7 +46,7 @@
  *       public int compareTo(MyWritableComparable w) {
  *         int thisValue = this.value;
  *         int thatValue = ((IntWritable)o).value;
- *         return (thisValue<thatValue ? -1 : (thisValue==thatValue ? 0 : 1));
+ *         return (thisValue &lt; thatValue ? -1 : (thisValue==thatValue ? 0 : 1));
  *       }
  *     }
  * </pre></blockquote></p>

Modified: lucene/hadoop/branches/branch-0.15/src/java/org/apache/hadoop/mapred/Mapper.java
URL: http://svn.apache.org/viewvc/lucene/hadoop/branches/branch-0.15/src/java/org/apache/hadoop/mapred/Mapper.java?rev=589551&r1=589550&r2=589551&view=diff
==============================================================================
--- lucene/hadoop/branches/branch-0.15/src/java/org/apache/hadoop/mapred/Mapper.java (original)
+++ lucene/hadoop/branches/branch-0.15/src/java/org/apache/hadoop/mapred/Mapper.java Mon Oct
29 02:02:50 2007
@@ -117,6 +117,7 @@
  *         output.collect(key, val);
  *       }
  *     }
+ * </pre></blockquote></p>
  *
  * <p>Applications may write a custom {@link MapRunnable} to exert greater
  * control on map processing e.g. multi-threaded <code>Mapper</code>s etc.</p>



Mime
View raw message