Repository: hadoop Updated Branches: refs/heads/branch-2 ef693b541 -> 71e6a4a73
HADOOP-11109. Site build is broken. Contributed by Jian He. (cherry picked from commit 0e2b64f2029cabbbf05a132625244427f8bf9518) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/71e6a4a7 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/71e6a4a7 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/71e6a4a7 Branch: refs/heads/branch-2 Commit: 71e6a4a735222c25bd0be7f6811863613ece3114 Parents: ef693b5 Author: Aaron T. Myers <a...@apache.org> Authored: Thu Sep 18 17:59:36 2014 -0700 Committer: Aaron T. Myers <a...@apache.org> Committed: Thu Sep 18 18:00:07 2014 -0700 ---------------------------------------------------------------------- hadoop-common-project/hadoop-common/CHANGES.txt | 4 +++- hadoop-common-project/hadoop-kms/src/site/apt/index.apt.vm | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/71e6a4a7/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 b325980..a8e8b6d 100644 --- a/hadoop-common-project/hadoop-common/CHANGES.txt +++ b/hadoop-common-project/hadoop-common/CHANGES.txt @@ -499,7 +499,9 @@ Release 2.6.0 - UNRELEASED HADOOP-11105. MetricsSystemImpl could leak memory in registered callbacks. (Chuan Liu via cnauroth) - KMS: Support for multiple Kerberos principals. (tucu) + HADOOP-10982. KMS: Support for multiple Kerberos principals. (tucu) + + HADOOP-11109. Site build is broken. (Jian He via atm) Release 2.5.1 - 2014-09-05 http://git-wip-us.apache.org/repos/asf/hadoop/blob/71e6a4a7/hadoop-common-project/hadoop-kms/src/site/apt/index.apt.vm ---------------------------------------------------------------------- diff --git a/hadoop-common-project/hadoop-kms/src/site/apt/index.apt.vm b/hadoop-common-project/hadoop-kms/src/site/apt/index.apt.vm index 5ab0bbe..2e8405f 100644 --- a/hadoop-common-project/hadoop-kms/src/site/apt/index.apt.vm +++ b/hadoop-common-project/hadoop-kms/src/site/apt/index.apt.vm @@ -626,7 +626,7 @@ $ keytool -genkey -alias tomcat -keyalg RSA <<NOTE:>> If using HTTPS, the SSL certificate used by the KMS instance must be configured to support multiple hostnames (see Java 7 - <<<keytool>> SAN extension support for details on how to do this). + <<<keytool>>> SAN extension support for details on how to do this). *** HTTP Authentication Signature
