hadoop-common-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From aajis...@apache.org
Subject hadoop git commit: HADOOP-13814. Sample configuration of KMS HTTP Authentication signature is misleading. Contributed by Masahiro Tanaka.
Date Mon, 21 Nov 2016 02:28:43 GMT
Repository: hadoop
Updated Branches:
  refs/heads/branch-2 ca3b40306 -> d29e3d0f5


HADOOP-13814. Sample configuration of KMS HTTP Authentication signature is misleading. Contributed
by Masahiro Tanaka.

(cherry picked from commit c65d6b65415742288b53f8e38314b71794e47ecc)


Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/d29e3d0f
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/d29e3d0f
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/d29e3d0f

Branch: refs/heads/branch-2
Commit: d29e3d0f52e869e0c87839056637d815ea308353
Parents: ca3b403
Author: Akira Ajisaka <aajisaka@apache.org>
Authored: Mon Nov 21 11:25:11 2016 +0900
Committer: Akira Ajisaka <aajisaka@apache.org>
Committed: Mon Nov 21 11:28:33 2016 +0900

----------------------------------------------------------------------
 hadoop-common-project/hadoop-kms/src/main/conf/kms-site.xml    | 4 ++--
 hadoop-common-project/hadoop-kms/src/site/markdown/index.md.vm | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hadoop/blob/d29e3d0f/hadoop-common-project/hadoop-kms/src/main/conf/kms-site.xml
----------------------------------------------------------------------
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 6c8becf..d188735 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 @@
 
   <property>
     <name>hadoop.kms.authentication.signer.secret.provider.zookeeper.auth.type</name>
-    <value>kerberos</value>
+    <value>none</value>
     <description>
-      The Zookeeper authentication type, 'none' or 'sasl' (Kerberos).
+      The Zookeeper authentication type, 'none' (default) or 'sasl' (Kerberos).
     </description>
   </property>
 

http://git-wip-us.apache.org/repos/asf/hadoop/blob/d29e3d0f/hadoop-common-project/hadoop-kms/src/site/markdown/index.md.vm
----------------------------------------------------------------------
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 e2396e7..1aa53eb 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
   </property>
   <property>
     <name>hadoop.kms.authentication.signer.secret.provider.zookeeper.auth.type</name>
-    <value>kerberos</value>
+    <value>sasl</value>
     <description>
-      The Zookeeper authentication type, 'none' or 'sasl' (Kerberos).
+      The Zookeeper authentication type, 'none' (default) or 'sasl' (Kerberos).
     </description>
   </property>
   <property>


---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org


Mime
View raw message