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 tu...@apache.org on 2014/08/21 20:59:45 UTC
svn commit: r1619543 - in
/hadoop/common/branches/branch-2/hadoop-common-project:
hadoop-common/CHANGES.txt hadoop-kms/src/site/apt/index.apt.vm
Author: tucu
Date: Thu Aug 21 18:59:44 2014
New Revision: 1619543
URL: http://svn.apache.org/r1619543
Log:
HADOOP-10920. site plugin couldn't parse hadoop-kms index.apt.vm. Contributed by Akira Ajisaka.
Conflicts:
hadoop-common-project/hadoop-common/CHANGES.txt
Modified:
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-kms/src/site/apt/index.apt.vm
Modified: hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt?rev=1619543&r1=1619542&r2=1619543&view=diff
==============================================================================
--- hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt (original)
+++ hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt Thu Aug 21 18:59:44 2014
@@ -279,6 +279,9 @@ Release 2.6.0 - UNRELEASED
HADOOP-10826. Iteration on KeyProviderFactory.serviceLoader is
thread-unsafe. (benoyantony viat tucu)
+ HADOOP-10920. site plugin couldn't parse hadoop-kms index.apt.vm.
+ (Akira Ajisaka via wang)
+
Release 2.5.0 - 2014-08-11
INCOMPATIBLE CHANGES
Modified: hadoop/common/branches/branch-2/hadoop-common-project/hadoop-kms/src/site/apt/index.apt.vm
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-common-project/hadoop-kms/src/site/apt/index.apt.vm?rev=1619543&r1=1619542&r2=1619543&view=diff
==============================================================================
--- hadoop/common/branches/branch-2/hadoop-common-project/hadoop-kms/src/site/apt/index.apt.vm (original)
+++ hadoop/common/branches/branch-2/hadoop-common-project/hadoop-kms/src/site/apt/index.apt.vm Thu Aug 21 18:59:44 2014
@@ -106,14 +106,14 @@ Hadoop Key Management Server (KMS) - Doc
** KMS Aggregated Audit logs
-Audit logs are aggregated for API accesses to the GET_KEY_VERSION,
-GET_CURRENT_KEY, DECRYPT_EEK, GENERATE_EEK operations.
+ Audit logs are aggregated for API accesses to the GET_KEY_VERSION,
+ GET_CURRENT_KEY, DECRYPT_EEK, GENERATE_EEK operations.
-Entries are grouped by the (user,key,operation) combined key for a configurable
-aggregation interval after which the number of accesses to the specified
-end-point by the user for a given key is flushed to the audit log.
+ Entries are grouped by the (user,key,operation) combined key for a
+ configurable aggregation interval after which the number of accesses to the
+ specified end-point by the user for a given key is flushed to the audit log.
-The Aggregation interval is configured via the property :
+ The Aggregation interval is configured via the property :
+---+
<property>