Apache
/
hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1487981 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Konstantin Boudnik 2013-05-30 19:13:12 +00:00
parent 0fb465cbc4
commit baff3aadac
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

@ -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

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
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"),

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 {
// 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.
public static class MyController extends Controller {
@ -46,7 +46,7 @@ public class MyApp {
@Override
public void index() {
set("anything", "something ☯");
set("anything", "something");
}
public void anythingYouWant() {