diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt b/hadoop-common-project/hadoop-common/CHANGES.txt index 1b4b27e4291..a0c2fa12d2f 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() 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 8801c6cf8ec..8355d9694ee 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; *
When conf.get("otherdir") is called, then ${env.BASE_DIR} * will be resolved to the value of the ${BASE_DIR} environment variable. * It supports ${env.NAME:-default} and ${env.NAME-default} notations. - * The former is resolved to “default” if ${NAME} environment variable is undefined + * The former is resolved to "default" if ${NAME} environment variable is undefined * or its value is empty. * The latter behaves the same way only if ${NAME} is undefined. *
By default, warnings will be given to any deprecated configuration
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 6983eb922c8..a0663950159 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