Author: cos Date: Thu May 30 19:13:12 2013 New Revision: 1487981 URL: http://svn.apache.org/r1487981 Log: HADOOP-9607. Fixes in Javadoc build. Contributed by Timothy St. Clair
Modified: hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/source/JvmMetricsInfo.java Modified: hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt?rev=1487981&r1=1487980&r2=1487981&view=diff ============================================================================== --- hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt (original) +++ hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt Thu May 30 19:13:12 2013 @@ -373,6 +373,8 @@ Release 2.0.5-beta - UNRELEASED HADOOP-9397. Incremental dist tar build fails. (Chris Nauroth via jlowe) + HADOOP-9607. Fixes in Javadoc build (Timothy St. Clair via cos) + Release 2.0.4-alpha - 2013-04-25 INCOMPATIBLE CHANGES Modified: hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/source/JvmMetricsInfo.java URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/source/JvmMetricsInfo.java?rev=1487981&r1=1487980&r2=1487981&view=diff ============================================================================== --- hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/source/JvmMetricsInfo.java (original) +++ hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/source/JvmMetricsInfo.java Thu May 30 19:13:12 2013 @@ -28,7 +28,7 @@ import org.apache.hadoop.metrics2.Metric */ @InterfaceAudience.Private public enum JvmMetricsInfo implements MetricsInfo { - JvmMetrics("JVM related metrics etc."), // record infoà + JvmMetrics("JVM related metrics etc."), // record info // metrics MemNonHeapUsedM("Non-heap memory used in MB"), MemNonHeapCommittedM("Non-heap memory committed in MB"),