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


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

Branch: refs/heads/YARN-2915
Commit: c65d6b65415742288b53f8e38314b71794e47ecc
Parents: 7584fbf
Author: Akira Ajisaka <[email protected]>
Authored: Mon Nov 21 11:25:11 2016 +0900
Committer: Akira Ajisaka <[email protected]>
Committed: Mon Nov 21 11:25:11 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/c65d6b65/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/c65d6b65/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 69eb1dd..39aab82 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: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to