Return-Path: X-Original-To: apmail-hadoop-common-commits-archive@www.apache.org Delivered-To: apmail-hadoop-common-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id EAC41187A4 for ; Thu, 7 Jan 2016 16:01:08 +0000 (UTC) Received: (qmail 68818 invoked by uid 500); 7 Jan 2016 16:01:08 -0000 Delivered-To: apmail-hadoop-common-commits-archive@hadoop.apache.org Received: (qmail 68755 invoked by uid 500); 7 Jan 2016 16:01:08 -0000 Mailing-List: contact common-commits-help@hadoop.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: common-dev@hadoop.apache.org Delivered-To: mailing list common-commits@hadoop.apache.org Received: (qmail 68740 invoked by uid 99); 7 Jan 2016 16:01:08 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 07 Jan 2016 16:01:08 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 290F1E2C5A; Thu, 7 Jan 2016 16:01:08 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: stevel@apache.org To: common-commits@hadoop.apache.org Date: Thu, 07 Jan 2016 16:01:08 -0000 Message-Id: <69890bc11967493ab5670699b45972ef@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [1/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) Repository: hadoop Updated Branches: refs/heads/branch-2 c329cab92 -> c6f7c30a8 refs/heads/trunk 172d07825 -> bac798abf 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/c6f7c30a Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/c6f7c30a Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/c6f7c30a Branch: refs/heads/branch-2 Commit: c6f7c30a8db264b892f1edd1cadb0c70085f9eb0 Parents: c329cab Author: Steve Loughran Authored: Thu Jan 7 16:00:37 2016 +0000 Committer: Steve Loughran Committed: Thu Jan 7 16:00:37 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/c6f7c30a/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 ad7a4fa..230bec1 100644 --- a/hadoop-common-project/hadoop-common/CHANGES.txt +++ b/hadoop-common-project/hadoop-common/CHANGES.txt @@ -30,6 +30,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/c6f7c30a/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 @@ - hadoop.security.keystore.JavaKeyStoreProvider.password - none + hadoop.security.keystore.java-keystore-provider.password-file + kms.keystore.password - If using the JavaKeyStoreProvider, the password for the keystore file. + If using the JavaKeyStoreProvider, the file name for the keystore password.