Просмотр исходного кода

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

(cherry picked from commit aee4500612e9d7da5a7a46e407f9f5dc6c22508b)
Akira Ajisaka 10 лет назад
Родитель
Сommit
13067cf4b1

+ 3 - 0
hadoop-common-project/hadoop-common/CHANGES.txt

@@ -391,6 +391,9 @@ Release 2.7.0 - UNRELEASED
     HADOOP-11008. Remove duplicated description about proxy-user in site 
     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
 
   INCOMPATIBLE CHANGES

+ 1 - 1
hadoop-common-project/hadoop-kms/src/main/conf/kms-acls.xml

@@ -41,7 +41,7 @@
     <value>*</value>
     <description>
       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.
     </description>
   </property>

+ 3 - 3
hadoop-common-project/hadoop-kms/src/site/apt/index.apt.vm

@@ -299,7 +299,7 @@ $ keytool -genkey -alias tomcat -keyalg RSA
     <value>*</value>
     <description>
       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.
     </description>
   </property>
@@ -309,7 +309,7 @@ $ keytool -genkey -alias tomcat -keyalg RSA
     <value>hdfs,foo</value>
     <description>
       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.
     </description>
   </property>
@@ -335,7 +335,7 @@ $ keytool -genkey -alias tomcat -keyalg RSA
     <value>*</value>
     <description>
       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.
     </description>
   </property>

+ 2 - 2
hadoop-common-project/hadoop-kms/src/test/resources/mini-kms-acls-default.xml

@@ -23,7 +23,7 @@
     <value>*</value>
     <description>
       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.
     </description>
   </property>
@@ -41,7 +41,7 @@
     <value>*</value>
     <description>
       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.
     </description>
   </property>