From d29e3d0f52e869e0c87839056637d815ea308353 Mon Sep 17 00:00:00 2001 From: Akira Ajisaka Date: Mon, 21 Nov 2016 11:25:11 +0900 Subject: [PATCH] HADOOP-13814. Sample configuration of KMS HTTP Authentication signature is misleading. Contributed by Masahiro Tanaka. (cherry picked from commit c65d6b65415742288b53f8e38314b71794e47ecc) --- hadoop-common-project/hadoop-kms/src/main/conf/kms-site.xml | 4 ++-- .../hadoop-kms/src/site/markdown/index.md.vm | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/hadoop-common-project/hadoop-kms/src/main/conf/kms-site.xml b/hadoop-common-project/hadoop-kms/src/main/conf/kms-site.xml index 6c8becf211d..d188735227d 100644 --- a/hadoop-common-project/hadoop-kms/src/main/conf/kms-site.xml +++ b/hadoop-common-project/hadoop-kms/src/main/conf/kms-site.xml @@ -147,9 +147,9 @@ hadoop.kms.authentication.signer.secret.provider.zookeeper.auth.type - kerberos + none - The Zookeeper authentication type, 'none' or 'sasl' (Kerberos). + The Zookeeper authentication type, 'none' (default) or 'sasl' (Kerberos). diff --git a/hadoop-common-project/hadoop-kms/src/site/markdown/index.md.vm b/hadoop-common-project/hadoop-kms/src/site/markdown/index.md.vm index e2396e757eb..1aa53eb1bef 100644 --- a/hadoop-common-project/hadoop-kms/src/site/markdown/index.md.vm +++ b/hadoop-common-project/hadoop-kms/src/site/markdown/index.md.vm @@ -737,9 +737,9 @@ This secret sharing can be done using a Zookeeper service which is configured in hadoop.kms.authentication.signer.secret.provider.zookeeper.auth.type - kerberos + sasl - The Zookeeper authentication type, 'none' or 'sasl' (Kerberos). + The Zookeeper authentication type, 'none' (default) or 'sasl' (Kerberos).