HADOOP-12457. [JDK8] Fix a failure of compiling common by javadoc. Contributed by Akira AJISAKA.
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/ea6b183a Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/ea6b183a Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/ea6b183a Branch: refs/heads/HDFS-8966 Commit: ea6b183a1a649ad2874050ade8856286728c654c Parents: 8a68630 Author: Tsuyoshi Ozawa <[email protected]> Authored: Tue Oct 27 10:57:45 2015 +0900 Committer: Tsuyoshi Ozawa <[email protected]> Committed: Tue Oct 27 10:57:45 2015 +0900 ---------------------------------------------------------------------- hadoop-common-project/hadoop-common/CHANGES.txt | 3 +++ .../src/main/java/org/apache/hadoop/conf/Configuration.java | 2 +- .../src/main/java/org/apache/hadoop/fs/shell/Delete.java | 2 +- .../hadoop-common/src/main/java/org/apache/hadoop/ipc/Server.java | 2 +- 4 files changed, 6 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/ea6b183a/hadoop-common-project/hadoop-common/CHANGES.txt ---------------------------------------------------------------------- diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt b/hadoop-common-project/hadoop-common/CHANGES.txt index 1b4b27e..a0c2fa1 100644 --- a/hadoop-common-project/hadoop-common/CHANGES.txt +++ b/hadoop-common-project/hadoop-common/CHANGES.txt @@ -1265,6 +1265,9 @@ Release 2.8.0 - UNRELEASED HADOOP-12513. Dockerfile lacks initial 'apt-get update'. (Akihiro Suda via ozawa) + HADOOP-12457. [JDK8] Fix a failure of compiling common by javadoc. + (Akira AJISAKA via ozawa) + OPTIMIZATIONS HADOOP-12051. ProtobufRpcEngine.invoke() should use Exception.toString() http://git-wip-us.apache.org/repos/asf/hadoop/blob/ea6b183a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/conf/Configuration.java ---------------------------------------------------------------------- diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/conf/Configuration.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/conf/Configuration.java index 8801c6c..8355d96 100644 --- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/conf/Configuration.java +++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/conf/Configuration.java @@ -179,7 +179,7 @@ import com.google.common.base.Preconditions; * <p>When <tt>conf.get("otherdir")</tt> is called, then <tt>${<i>env.BASE_DIR</i>}</tt> * will be resolved to the value of the <tt>${<i>BASE_DIR</i>}</tt> environment variable. * It supports <tt>${<i>env.NAME:-default</i>}</tt> and <tt>${<i>env.NAME-default</i>}</tt> notations. - * The former is resolved to âdefaultâ if <tt>${<i>NAME</i>}</tt> environment variable is undefined + * The former is resolved to "default" if <tt>${<i>NAME</i>}</tt> environment variable is undefined * or its value is empty. * The latter behaves the same way only if <tt>${<i>NAME</i>}</tt> is undefined. * <p>By default, warnings will be given to any deprecated configuration http://git-wip-us.apache.org/repos/asf/hadoop/blob/ea6b183a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/shell/Delete.java ---------------------------------------------------------------------- diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/shell/Delete.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/shell/Delete.java index 6983eb9..a066395 100644 --- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/shell/Delete.java +++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/shell/Delete.java @@ -65,7 +65,7 @@ class Delete { "-[rR]: Recursively deletes directories.\n" + "-skipTrash: option bypasses trash, if enabled, and immediately " + "deletes <src>.\n" + - "-safely: option requires safety confirmationï¼if enabled, " + + "-safely: option requires safety confirmation, if enabled, " + "requires confirmation before deleting large directory with more " + "than <hadoop.shell.delete.limit.num.files> files. Delay is " + "expected when walking over large directory recursively to count " + http://git-wip-us.apache.org/repos/asf/hadoop/blob/ea6b183a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/Server.java ---------------------------------------------------------------------- diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/Server.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/Server.java index 39cabc2..26043a7 100644 --- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/Server.java +++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/Server.java @@ -416,7 +416,7 @@ public abstract class Server { * if this request took too much time relative to other requests * we consider that as a slow RPC. 3 is a magic number that comes * from 3 sigma deviation. A very simple explanation can be found - * by searching for 68â95â99.7 rule. We flag an RPC as slow RPC + * by searching for 68-95-99.7 rule. We flag an RPC as slow RPC * if and only if it falls above 99.7% of requests. We start this logic * only once we have enough sample size. */
