You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by om...@apache.org on 2011/04/23 00:44:08 UTC
svn commit: r1096072 - in /hadoop/common/branches/branch-0.20-security: ./
src/core/org/apache/hadoop/metrics/util/ src/mapred/
src/mapred/org/apache/hadoop/mapred/
Author: omalley
Date: Fri Apr 22 22:44:07 2011
New Revision: 1096072
URL: http://svn.apache.org/viewvc?rev=1096072&view=rev
Log:
HADOOP-7232. Fix Javadoc warnings. (omalley)
Modified:
hadoop/common/branches/branch-0.20-security/ (props changed)
hadoop/common/branches/branch-0.20-security/CHANGES.txt (contents, props changed)
hadoop/common/branches/branch-0.20-security/src/core/org/apache/hadoop/metrics/util/MetricsIntValue.java
hadoop/common/branches/branch-0.20-security/src/core/org/apache/hadoop/metrics/util/MetricsTimeVaryingInt.java
hadoop/common/branches/branch-0.20-security/src/core/org/apache/hadoop/metrics/util/MetricsTimeVaryingLong.java
hadoop/common/branches/branch-0.20-security/src/core/org/apache/hadoop/metrics/util/MetricsTimeVaryingRate.java
hadoop/common/branches/branch-0.20-security/src/mapred/ (props changed)
hadoop/common/branches/branch-0.20-security/src/mapred/org/apache/hadoop/mapred/TaskLogsTruncater.java
Propchange: hadoop/common/branches/branch-0.20-security/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Apr 22 22:44:07 2011
@@ -1,3 +1,4 @@
/hadoop/common/branches/branch-0.20:960946
+/hadoop/common/branches/branch-0.20-security-203:1096071
/hadoop/core/branches/branch-0.19:713112
/hadoop/core/trunk:727001,727117,727191,727212,727217,727228,727255,727869,728187,729052,729987,732385,732572,732613,732777,732838,732869,733887,734870,734916,736426,738328,738697,740077,740157,741703,741762,743745,743816,743892,744894,745180,746010,746206,746227,746233,746274,746338,746902-746903,746925,746944,746968,746970,747279,747289,747802,748084,748090,748783,749262,749318,749863,750533,752073,752609,752834,752836,752913,752932,753112-753113,753346,754645,754847,754927,755035,755226,755348,755370,755418,755426,755790,755905,755938,755960,755986,755998,756352,757448,757624,757849,758156,758180,759398,759932,760502,760783,761046,761482,761632,762216,762879,763107,763502,764967,765016,765809,765951,771607,771661,772844,772876,772884,772920,773889,776638,778962,778966,779893,781720,784661,785046,785569
Modified: hadoop/common/branches/branch-0.20-security/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security/CHANGES.txt?rev=1096072&r1=1096071&r2=1096072&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.20-security/CHANGES.txt (original)
+++ hadoop/common/branches/branch-0.20-security/CHANGES.txt Fri Apr 22 22:44:07 2011
@@ -112,6 +112,8 @@ Release 0.20.203.0 - unreleased
HADOOP-6879. Provide SSH based (Jsch) remote execution API for system
tests. (cos)
+ HADOOP-7232. Fix Javadoc warnings. (omalley)
+
Release 0.20.202.0 - unreleased
MAPREDUCE-2355. Add a configuration knob
Propchange: hadoop/common/branches/branch-0.20-security/CHANGES.txt
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Apr 22 22:44:07 2011
@@ -1,4 +1,5 @@
/hadoop/common/branches/branch-0.20/CHANGES.txt:960946
+/hadoop/common/branches/branch-0.20-security-203/CHANGES.txt:1096071
/hadoop/core/branches/branch-0.18/CHANGES.txt:727226
/hadoop/core/branches/branch-0.19/CHANGES.txt:713112
/hadoop/core/trunk/CHANGES.txt:727001,727117,727191,727212,727228,727255,727869,728187,729052,729987,732385,732572,732613,732777,732838,732869,733887,734870,734916,735082,736426,738602,738697,739416,740077,740157,741703,741762,743296,743745,743816,743892,744894,745180,745268,746010,746193,746206,746227,746233,746274,746902-746903,746925,746944,746968,746970,747279,747289,747802,748084,748090,748783,749262,749318,749863,750533,752073,752514,752555,752590,752609,752834,752836,752913,752932,753112-753113,753346,754645,754847,754927,755035,755226,755348,755370,755418,755426,755790,755905,755938,755986,755998,756352,757448,757624,757849,758156,758180,759398,759932,760502,760783,761046,761482,761632,762216,762879,763107,763502,764967,765016,765809,765951,771607,772844,772876,772884,772920,773889,776638,778962,778966,779893,781720,784661,785046,785569
Modified: hadoop/common/branches/branch-0.20-security/src/core/org/apache/hadoop/metrics/util/MetricsIntValue.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security/src/core/org/apache/hadoop/metrics/util/MetricsIntValue.java?rev=1096072&r1=1096071&r2=1096072&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.20-security/src/core/org/apache/hadoop/metrics/util/MetricsIntValue.java (original)
+++ hadoop/common/branches/branch-0.20-security/src/core/org/apache/hadoop/metrics/util/MetricsIntValue.java Fri Apr 22 22:44:07 2011
@@ -30,7 +30,7 @@ import org.apache.commons.logging.LogFac
* Each time its value is set, it is published only *once* at the next update
* call.
*
- * @deprecated in favor of {@link org.apache.hadoop.metrics2.lib.MutableGaugeInt}.
+ * @deprecated in favor of {@link org.apache.hadoop.metrics2.lib.MetricMutableGaugeInt}.
*/
@Deprecated
@InterfaceAudience.LimitedPrivate({"HDFS", "MapReduce"})
Modified: hadoop/common/branches/branch-0.20-security/src/core/org/apache/hadoop/metrics/util/MetricsTimeVaryingInt.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security/src/core/org/apache/hadoop/metrics/util/MetricsTimeVaryingInt.java?rev=1096072&r1=1096071&r2=1096072&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.20-security/src/core/org/apache/hadoop/metrics/util/MetricsTimeVaryingInt.java (original)
+++ hadoop/common/branches/branch-0.20-security/src/core/org/apache/hadoop/metrics/util/MetricsTimeVaryingInt.java Fri Apr 22 22:44:07 2011
@@ -34,7 +34,7 @@ import org.apache.commons.logging.LogFac
* Note if one wants a time associated with the metric then use
* @see org.apache.hadoop.metrics.util.MetricsTimeVaryingRate
*
- * @deprecated in favor of {@link org.apache.hadoop.metrics2.lib.MutableCounterInt}.
+ * @deprecated in favor of {@link org.apache.hadoop.metrics2.lib.MetricMutableCounterInt}.
*/
@Deprecated
@InterfaceAudience.LimitedPrivate({"HDFS", "MapReduce"})
Modified: hadoop/common/branches/branch-0.20-security/src/core/org/apache/hadoop/metrics/util/MetricsTimeVaryingLong.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security/src/core/org/apache/hadoop/metrics/util/MetricsTimeVaryingLong.java?rev=1096072&r1=1096071&r2=1096072&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.20-security/src/core/org/apache/hadoop/metrics/util/MetricsTimeVaryingLong.java (original)
+++ hadoop/common/branches/branch-0.20-security/src/core/org/apache/hadoop/metrics/util/MetricsTimeVaryingLong.java Fri Apr 22 22:44:07 2011
@@ -35,7 +35,7 @@ import org.apache.commons.logging.LogFac
* Note if one wants a time associated with the metric then use
* @see org.apache.hadoop.metrics.util.MetricsTimeVaryingRate
*
- * @deprecated in favor of {@link org.apache.hadoop.metrics2.lib.MutableCounterLong}.
+ * @deprecated in favor of {@link org.apache.hadoop.metrics2.lib.MetricMutableCounterLong}.
*/
@Deprecated
@InterfaceAudience.LimitedPrivate({"HDFS", "MapReduce"})
Modified: hadoop/common/branches/branch-0.20-security/src/core/org/apache/hadoop/metrics/util/MetricsTimeVaryingRate.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security/src/core/org/apache/hadoop/metrics/util/MetricsTimeVaryingRate.java?rev=1096072&r1=1096071&r2=1096072&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.20-security/src/core/org/apache/hadoop/metrics/util/MetricsTimeVaryingRate.java (original)
+++ hadoop/common/branches/branch-0.20-security/src/core/org/apache/hadoop/metrics/util/MetricsTimeVaryingRate.java Fri Apr 22 22:44:07 2011
@@ -32,7 +32,7 @@ import org.apache.commons.logging.LogFac
* This class also keeps track of the min and max rates along with
* a method to reset the min-max.
*
- * @deprecated in favor of {@link org.apache.hadoop.metrics2.lib.MutableRate}.
+ * @deprecated in favor of {@link org.apache.hadoop.metrics2.lib.MetricMutableGauge}.
*/
@Deprecated
@InterfaceAudience.LimitedPrivate({"HDFS", "MapReduce"})
Propchange: hadoop/common/branches/branch-0.20-security/src/mapred/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Apr 22 22:44:07 2011
@@ -1,4 +1,5 @@
/hadoop/common/branches/branch-0.20/src/mapred:960946
+/hadoop/common/branches/branch-0.20-security-203/src/mapred:1096071
/hadoop/core/branches/branch-0.19/src/mapred:713112
/hadoop/core/trunk/src/mapred:727001,727117,727191,727212,727217,727228,727255,727869,728187,729052,729987,732385,732572,732613,732777,732838,732869,733887,734870,734916,736426,738328,738697,740077,740157,741703,741762,743745,743816,743892,744894,745180,746010,746206,746227,746233,746274,746338,746902-746903,746925,746944,746968,746970,747279,747289,747802,748084,748090,748783,749262,749318,749863,750533,752073,752609,752834,752836,752913,752932,753112-753113,753346,754645,754847,754927,755035,755226,755348,755370,755418,755426,755790,755905,755938,755960,755986,755998,756352,757448,757624,757849,758156,758180,759398,759932,760502,760783,761046,761482,761632,762216,762879,763107,763502,764967,765016,765809,765951,771607,771661,772844,772876,772884,772920,773889,776638,778962,778966,779893,781720,784661,785046,785569
/hadoop/mapreduce/trunk/src/java:808650
Modified: hadoop/common/branches/branch-0.20-security/src/mapred/org/apache/hadoop/mapred/TaskLogsTruncater.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security/src/mapred/org/apache/hadoop/mapred/TaskLogsTruncater.java?rev=1096072&r1=1096071&r2=1096072&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.20-security/src/mapred/org/apache/hadoop/mapred/TaskLogsTruncater.java (original)
+++ hadoop/common/branches/branch-0.20-security/src/mapred/org/apache/hadoop/mapred/TaskLogsTruncater.java Fri Apr 22 22:44:07 2011
@@ -82,7 +82,7 @@ public class TaskLogsTruncater {
* Check the log file sizes generated by the attempts that ran in a
* particular JVM
* @param lInfo
- * @return
+ * @return is truncation required?
* @throws IOException
*/
public boolean shouldTruncateLogs(JVMInfo lInfo) throws IOException {