Apache
/
hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HADOOP-11493. Fix some typos in kms-acls.xml description. (Contributed by Charles Lamb) 

(cherry picked from commit aee4500612)
This commit is contained in:
Akira Ajisaka 2015-01-23 11:48:19 +09:00
parent 639c7b0ddc
commit 13067cf4b1
4 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
hadoop-common-project/hadoop-common/CHANGES.txt
View File

@ -391,6 +391,9 @@ Release 2.7.0 - UNRELEASED
HADOOP-11008. Remove duplicated description about proxy-user in site HADOOP-11008. Remove duplicated description about proxy-user in site
documents (Masatake Iwasaki via aw) documents (Masatake Iwasaki via aw)
HADOOP-11493. Fix some typos in kms-acls.xml description.
(Charles Lamb via aajisaka)
Release 2.6.0 - 2014-11-18 Release 2.6.0 - 2014-11-18
INCOMPATIBLE CHANGES INCOMPATIBLE CHANGES

2
hadoop-common-project/hadoop-kms/src/main/conf/kms-acls.xml
View File

@ -41,7 +41,7 @@
<value>*</value> <value>*</value>
<description> <description>
ACL for rollover-key operations. ACL for rollover-key operations.
If the user does is not in the GET ACL, the key material is not returned If the user is not in the GET ACL, the key material is not returned
as part of the response. as part of the response.
</description> </description>
</property> </property>

6
hadoop-common-project/hadoop-kms/src/site/apt/index.apt.vm
View File

@ -299,7 +299,7 @@ $ keytool -genkey -alias tomcat -keyalg RSA
<value>*</value> <value>*</value>
<description> <description>
ACL for create-key operations. ACL for create-key operations.
If the user does is not in the GET ACL, the key material is not returned If the user is not in the GET ACL, the key material is not returned
as part of the response. as part of the response.
</description> </description>
</property> </property>
@ -309,7 +309,7 @@ $ keytool -genkey -alias tomcat -keyalg RSA
<value>hdfs,foo</value> <value>hdfs,foo</value>
<description> <description>
Blacklist for create-key operations. Blacklist for create-key operations.
If the user does is in the Blacklist, the key material is not returned If the user is in the Blacklist, the key material is not returned
as part of the response. as part of the response.
</description> </description>
</property> </property>
@ -335,7 +335,7 @@ $ keytool -genkey -alias tomcat -keyalg RSA
<value>*</value> <value>*</value>
<description> <description>
ACL for rollover-key operations. ACL for rollover-key operations.
If the user does is not in the GET ACL, the key material is not returned If the user is not in the GET ACL, the key material is not returned
as part of the response. as part of the response.
</description> </description>
</property> </property>

4
hadoop-common-project/hadoop-kms/src/test/resources/mini-kms-acls-default.xml
View File

@ -23,7 +23,7 @@
<value>*</value> <value>*</value>
<description> <description>
ACL for create-key operations. ACL for create-key operations.
If the user does is not in the GET ACL, the key material is not returned If the user is not in the GET ACL, the key material is not returned
as part of the response. as part of the response.
</description> </description>
</property> </property>
@ -41,7 +41,7 @@
<value>*</value> <value>*</value>
<description> <description>
ACL for rollover-key operations. ACL for rollover-key operations.
If the user does is not in the GET ACL, the key material is not returned If the user is not in the GET ACL, the key material is not returned
as part of the response. as part of the response.
</description> </description>
</property> </property>