Mailing-List: contact common-commits-help@hadoop.apache.org; run by ezmlm
Precedence: bulk
Reply-To: common-dev@hadoop.apache.org
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1325057 - in /hadoop/common/branches/branch-1: ./
 src/core/org/apache/hadoop/net/ src/core/org/apache/hadoop/util/
 src/mapred/org/apache/hadoop/mapreduce/lib/partition/
Date: Wed, 11 Apr 2012 23:04:18 -0000
To: common-commits@hadoop.apache.org
From: eli@apache.org
Message-Id: <20120411230419.2DFB8238890B@eris.apache.org>

Author: eli
Date: Wed Apr 11 23:04:18 2012
New Revision: 1325057

URL: http://svn.apache.org/viewvc?rev=1325057&view=rev
Log:
HADOOP-8269. Fix some javadoc warnings on branch-1. Contributed by Eli Collins

Modified:
    hadoop/common/branches/branch-1/CHANGES.txt
    hadoop/common/branches/branch-1/src/core/org/apache/hadoop/net/DNS.java
    hadoop/common/branches/branch-1/src/core/org/apache/hadoop/net/NetUtils.java
    hadoop/common/branches/branch-1/src/core/org/apache/hadoop/util/StringUtils.java
    hadoop/common/branches/branch-1/src/mapred/org/apache/hadoop/mapreduce/lib/partition/KeyFieldBasedComparator.java

Modified: hadoop/common/branches/branch-1/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-1/CHANGES.txt?rev=1325057&r1=1325056&r2=1325057&view=diff
==============================================================================
--- hadoop/common/branches/branch-1/CHANGES.txt (original)
+++ hadoop/common/branches/branch-1/CHANGES.txt Wed Apr 11 23:04:18 2012
@@ -214,6 +214,8 @@ Release 1.1.0 - unreleased
     MAPREDUCE-4003. log.index (No such file or directory) AND Task process 
     exit with nonzero status of 126. (Koji Noguchi via tgraves)
 
+    HADOOP-8269. Fix some javadoc warnings on branch-1.
+
 Release 1.0.3 - unreleased
 
   NEW FEATURES

Modified: hadoop/common/branches/branch-1/src/core/org/apache/hadoop/net/DNS.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-1/src/core/org/apache/hadoop/net/DNS.java?rev=1325057&r1=1325056&r2=1325057&view=diff
==============================================================================
--- hadoop/common/branches/branch-1/src/core/org/apache/hadoop/net/DNS.java (original)
+++ hadoop/common/branches/branch-1/src/core/org/apache/hadoop/net/DNS.java Wed Apr 11 23:04:18 2012
@@ -119,7 +119,7 @@ public class DNS {
   }
 
   /**
-   * Like {@link DNS#getIPs(String, boolean), but returns all
+   * Like {@link DNS#getIPs(String, boolean)}, but returns all
    * IPs associated with the given interface and its subinterfaces.
    */
   public static String[] getIPs(String strInterface)

Modified: hadoop/common/branches/branch-1/src/core/org/apache/hadoop/net/NetUtils.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-1/src/core/org/apache/hadoop/net/NetUtils.java?rev=1325057&r1=1325056&r2=1325057&view=diff
==============================================================================
--- hadoop/common/branches/branch-1/src/core/org/apache/hadoop/net/NetUtils.java (original)
+++ hadoop/common/branches/branch-1/src/core/org/apache/hadoop/net/NetUtils.java Wed Apr 11 23:04:18 2012
@@ -486,7 +486,7 @@ public class NetUtils {
    * also takes a local address and port to bind the socket to. 
    * 
    * @param socket
-   * @param address the remote address
+   * @param endpoint the remote address
    * @param localAddr the local address to bind the socket to
    * @param timeout timeout in milliseconds
    */

Modified: hadoop/common/branches/branch-1/src/core/org/apache/hadoop/util/StringUtils.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-1/src/core/org/apache/hadoop/util/StringUtils.java?rev=1325057&r1=1325056&r2=1325057&view=diff
==============================================================================
--- hadoop/common/branches/branch-1/src/core/org/apache/hadoop/util/StringUtils.java (original)
+++ hadoop/common/branches/branch-1/src/core/org/apache/hadoop/util/StringUtils.java Wed Apr 11 23:04:18 2012
@@ -737,7 +737,7 @@ public class StringUtils {
    * Concatenates objects, using a separator.
    *
    * @param separator to join with
-   * @param object to join
+   * @param objects to join
    * @return the joined string
    */
   public static String join(CharSequence separator, Object[] objects) {

Modified: hadoop/common/branches/branch-1/src/mapred/org/apache/hadoop/mapreduce/lib/partition/KeyFieldBasedComparator.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-1/src/mapred/org/apache/hadoop/mapreduce/lib/partition/KeyFieldBasedComparator.java?rev=1325057&r1=1325056&r2=1325057&view=diff
==============================================================================
--- hadoop/common/branches/branch-1/src/mapred/org/apache/hadoop/mapreduce/lib/partition/KeyFieldBasedComparator.java (original)
+++ hadoop/common/branches/branch-1/src/mapred/org/apache/hadoop/mapreduce/lib/partition/KeyFieldBasedComparator.java Wed Apr 11 23:04:18 2012
@@ -44,8 +44,8 @@ import org.apache.hadoop.mapreduce.lib.p
  *  character. If '.c' is omitted from pos1, it defaults to 1 (the beginning
  *  of the field); if omitted from pos2, it defaults to 0 (the end of the
  *  field). opts are ordering options (any of 'nr' as described above). 
- * We assume that the fields in the key are separated by 
- * {@link JobContext#MAP_OUTPUT_KEY_FIELD_SEPERATOR}.
+ * We assume that the fields in the key are separated by
+ * mapreduce.map.output.key.field.separator.
  */
 @InterfaceAudience.Public
 @InterfaceStability.Stable