From e7859015bcc2cda99a64b1db18baab0e1ca5c155 Mon Sep 17 00:00:00 2001 From: yliu Date: Tue, 28 Oct 2014 14:21:26 +0800 Subject: [PATCH] HADOOP-11233. hadoop.security.kms.client.encrypted.key.cache.expiry property spelled wrong in core-default. (Stephen Chu via yliu) --- .../hadoop-common/src/main/resources/core-default.xml | 2 +- hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) 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 4fa8cf36f34..69dedfccf5e 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. - "hadoop.security.kms.client.encrypted.key.cache.expiry + hadoop.security.kms.client.encrypted.key.cache.expiry 43200000 Cache expiry time for a Key, after which the cache Queue for this diff --git a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt index 9db3535d104..456f77b8371 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