Repository: hadoop Updated Branches: refs/heads/branch-2 235a77fe1 -> 71db37266
HADOOP-11316. "mvn package -Pdist,docs -DskipTests -Dtar" fails because of non-ascii characters. (ozawa) (cherry picked from commit 9850e1584b7bb47c39d777d6fc4931dd54fbaea7) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/71db3726 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/71db3726 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/71db3726 Branch: refs/heads/branch-2 Commit: 71db37266bd47fd49cde7f1bdabb0a16c7ebb80e Parents: 235a77f Author: Tsuyoshi Ozawa <[email protected]> Authored: Wed Jan 28 22:01:16 2015 +0900 Committer: Tsuyoshi Ozawa <[email protected]> Committed: Wed Jan 28 22:01:38 2015 +0900 ---------------------------------------------------------------------- hadoop-common-project/hadoop-common/CHANGES.txt | 3 +++ .../java/org/apache/hadoop/fs/CommonConfigurationKeysPublic.java | 2 +- .../src/main/java/org/apache/hadoop/util/ComparableVersion.java | 2 -- 3 files changed, 4 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/71db3726/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 4c75ee5..49837f9 100644 --- a/hadoop-common-project/hadoop-common/CHANGES.txt +++ b/hadoop-common-project/hadoop-common/CHANGES.txt @@ -423,6 +423,9 @@ Release 2.7.0 - UNRELEASED HADOOP-11469. KMS should skip default.key.acl and whitelist.key.acl when loading key acl. (Dian Fu via yliu) + HADOOP-11316. "mvn package -Pdist,docs -DskipTests -Dtar" fails because + of non-ascii characters. (ozawa) + Release 2.6.1 - UNRELEASED INCOMPATIBLE CHANGES http://git-wip-us.apache.org/repos/asf/hadoop/blob/71db3726/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/CommonConfigurationKeysPublic.java ---------------------------------------------------------------------- diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/CommonConfigurationKeysPublic.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/CommonConfigurationKeysPublic.java index 8309e2e..d287bdd 100644 --- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/CommonConfigurationKeysPublic.java +++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/CommonConfigurationKeysPublic.java @@ -315,7 +315,7 @@ public class CommonConfigurationKeysPublic { public static final String HADOOP_SECURITY_IMPERSONATION_PROVIDER_CLASS = "hadoop.security.impersonation.provider.class"; - // <!--- KMSClientProvider configurations â> + // <!-- KMSClientProvider configurations --> /** See <a href="{@docRoot}/../core-default.html">core-default.xml</a> */ public static final String KMS_CLIENT_ENC_KEY_CACHE_SIZE = "hadoop.security.kms.client.encrypted.key.cache.size"; http://git-wip-us.apache.org/repos/asf/hadoop/blob/71db3726/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/ComparableVersion.java ---------------------------------------------------------------------- diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/ComparableVersion.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/ComparableVersion.java index ebe46d8..65d85f7 100644 --- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/ComparableVersion.java +++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/ComparableVersion.java @@ -9,8 +9,6 @@ // to // package org.apache.hadoop.util; // 2. Removed author tags to clear hadoop author tag warning -// author <a href="mailto:[email protected]";>Kenney Westerhof</a> -// author <a href="mailto:[email protected]";>Hervé Boutemy</a> // package org.apache.hadoop.util;
