big-data/hadoop
1
0
Fork 0
Code Issues Pull Requests Projects Wiki Activity

HADOOP-9607. Fixes in Javadoc build. Contributed by Timothy St. Clair

Browse Source 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1487979 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Konstantin Boudnik 2013-05-30 19:06:49 +00:00
parent bf99961d67
commit 2fb2a5ab42
3 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hadoop-common-project/hadoop-common/CHANGES.txt
View File

@ -735,6 +735,8 @@ Release 2.0.5-beta - UNRELEASED
HADOOP-9553. TestAuthenticationToken fails on Windows. HADOOP-9553. TestAuthenticationToken fails on Windows.
(Arpit Agarwal via suresh) (Arpit Agarwal via suresh)
HADOOP-9607. Fixes in Javadoc build (Timothy St. Clair via cos)
Release 2.0.4-alpha - 2013-04-25 Release 2.0.4-alpha - 2013-04-25
INCOMPATIBLE CHANGES INCOMPATIBLE CHANGES

2
hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/source/JvmMetricsInfo.java
View File

@ -28,7 +28,7 @@ import org.apache.hadoop.metrics2.MetricsInfo;
*/ */
@InterfaceAudience.Private @InterfaceAudience.Private
public enum JvmMetricsInfo implements MetricsInfo { public enum JvmMetricsInfo implements MetricsInfo {
JvmMetrics("JVM related metrics etc."), // record infoß JvmMetrics("JVM related metrics etc."), // record info
// metrics // metrics
MemNonHeapUsedM("Non-heap memory used in MB"), MemNonHeapUsedM("Non-heap memory used in MB"),
MemNonHeapCommittedM("Non-heap memory committed in MB"), MemNonHeapCommittedM("Non-heap memory committed in MB"),

4
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/webapp/example/MyApp.java
View File

@ -32,7 +32,7 @@ import org.apache.hadoop.yarn.webapp.view.HtmlPage;
public class MyApp { public class MyApp {
// This is an app API // This is an app API
public String anyAPI() { return "anything ☁, really!"; } public String anyAPI() { return "anything, really!"; }
// Note this is static so it can be in any files. // Note this is static so it can be in any files.
public static class MyController extends Controller { public static class MyController extends Controller {
@ -46,7 +46,7 @@ public class MyApp {
@Override @Override
public void index() { public void index() {
set("anything", "something ☯"); set("anything", "something");
} }
public void anythingYouWant() { public void anythingYouWant() {