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 yl...@apache.org on 2014/10/28 07:47:39 UTC

git commit: HADOOP-11233. hadoop.security.kms.client.encrypted.key.cache.expiry property spelled wrong in core-default. (Stephen Chu via yliu)

Repository: hadoop
Updated Branches:
  refs/heads/trunk 971e91c8c -> e7859015b


HADOOP-11233. hadoop.security.kms.client.encrypted.key.cache.expiry property spelled wrong in core-default. (Stephen Chu via yliu)


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

Branch: refs/heads/trunk
Commit: e7859015bcc2cda99a64b1db18baab0e1ca5c155
Parents: 971e91c
Author: yliu <yl...@apache.org>
Authored: Tue Oct 28 14:21:26 2014 +0800
Committer: yliu <yl...@apache.org>
Committed: Tue Oct 28 14:21:26 2014 +0800

----------------------------------------------------------------------
 .../hadoop-common/src/main/resources/core-default.xml             | 2 +-
 hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt                       | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hadoop/blob/e7859015/hadoop-common-project/hadoop-common/src/main/resources/core-default.xml
----------------------------------------------------------------------
diff --git a/hadoop-common-project/hadoop-common/src/main/resources/core-default.xml b/hadoop-common-project/hadoop-common/src/main/resources/core-default.xml
index 4fa8cf3..69dedfc 100644
--- a/hadoop-common-project/hadoop-common/src/main/resources/core-default.xml
+++ b/hadoop-common-project/hadoop-common/src/main/resources/core-default.xml
@@ -1637,7 +1637,7 @@ for ldap providers in the same way as above does.
   </description>
 </property>
 <property>
-  <name>"hadoop.security.kms.client.encrypted.key.cache.expiry</name>
+  <name>hadoop.security.kms.client.encrypted.key.cache.expiry</name>
   <value>43200000</value>
   <description>
     Cache expiry time for a Key, after which the cache Queue for this

http://git-wip-us.apache.org/repos/asf/hadoop/blob/e7859015/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
----------------------------------------------------------------------
diff --git a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
index 9db3535..456f77b 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
+++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
@@ -940,6 +940,9 @@ Release 2.6.0 - UNRELEASED
     HDFS-7243. HDFS concat operation should not be allowed in Encryption Zone.
     (clamb via yliu)
 
+    HADOOP-11233. hadoop.security.kms.client.encrypted.key.cache.expiry
+    property spelled wrong in core-default. (Stephen Chu via yliu) 
+
     BREAKDOWN OF HDFS-6134 AND HADOOP-10150 SUBTASKS AND RELATED JIRAS
   
       HDFS-6387. HDFS CLI admin tool for creating & deleting an