You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by st...@apache.org on 2016/01/07 17:01:09 UTC

[2/2] hadoop git commit: HADOOP-12597. In kms-site.xml configuration "hadoop.security.keystore.JavaKeyStoreProvider.password" should be updated with new name. (Surendra Singh Lilhore via stevel)

HADOOP-12597. In kms-site.xml configuration   "hadoop.security.keystore.JavaKeyStoreProvider.password" should be updated with new name. (Surendra Singh Lilhore via stevel)


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

Branch: refs/heads/trunk
Commit: bac798abfcaf651db2e8c1a33c661da0c22d42ab
Parents: 172d078
Author: Steve Loughran <st...@apache.org>
Authored: Thu Jan 7 16:00:37 2016 +0000
Committer: Steve Loughran <st...@apache.org>
Committed: Thu Jan 7 16:00:54 2016 +0000

----------------------------------------------------------------------
 hadoop-common-project/hadoop-common/CHANGES.txt             | 4 ++++
 hadoop-common-project/hadoop-kms/src/main/conf/kms-site.xml | 6 +++---
 2 files changed, 7 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hadoop/blob/bac798ab/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 d27f257..84cd025 100644
--- a/hadoop-common-project/hadoop-common/CHANGES.txt
+++ b/hadoop-common-project/hadoop-common/CHANGES.txt
@@ -671,6 +671,10 @@ Release 2.9.0 - UNRELEASED
     HADOOP-12613. TestFind.processArguments occasionally fails.
    (Wei-Chiu Chuang via stevel)
 
+   HADOOP-12597. In kms-site.xml configuration
+   "hadoop.security.keystore.JavaKeyStoreProvider.password"
+   should be updated with new name. (Surendra Singh Lilhore via stevel)
+
 Release 2.8.0 - UNRELEASED
 
   INCOMPATIBLE CHANGES

http://git-wip-us.apache.org/repos/asf/hadoop/blob/bac798ab/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 a810ca4..e8d2344 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
@@ -25,10 +25,10 @@
   </property>
 
   <property>
-    <name>hadoop.security.keystore.JavaKeyStoreProvider.password</name>
-    <value>none</value>
+    <name>hadoop.security.keystore.java-keystore-provider.password-file</name>
+    <value>kms.keystore.password</value>
     <description>
-      If using the JavaKeyStoreProvider, the password for the keystore file.
+      If using the JavaKeyStoreProvider, the file name for the keystore password.
     </description>
   </property>