hadoop-common-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From aajis...@apache.org
Subject hadoop git commit: HADOOP-11493. Fix some typos in kms-acls.xml description. (Contributed by Charles Lamb)
Date Fri, 23 Jan 2015 02:49:53 GMT
Repository: hadoop
Updated Branches:
  refs/heads/trunk d3268c4b1 -> aee450061


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


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

Branch: refs/heads/trunk
Commit: aee4500612e9d7da5a7a46e407f9f5dc6c22508b
Parents: d3268c4
Author: Akira Ajisaka <aajisaka@apache.org>
Authored: Fri Jan 23 11:48:19 2015 +0900
Committer: Akira Ajisaka <aajisaka@apache.org>
Committed: Fri Jan 23 11:48:19 2015 +0900

----------------------------------------------------------------------
 hadoop-common-project/hadoop-common/CHANGES.txt                | 3 +++
 hadoop-common-project/hadoop-kms/src/main/conf/kms-acls.xml    | 2 +-
 hadoop-common-project/hadoop-kms/src/site/apt/index.apt.vm     | 6 +++---
 .../hadoop-kms/src/test/resources/mini-kms-acls-default.xml    | 4 ++--
 4 files changed, 9 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hadoop/blob/aee45006/hadoop-common-project/hadoop-common/CHANGES.txt
----------------------------------------------------------------------
diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt b/hadoop-common-project/hadoop-common/CHANGES.txt
index 47eaf7b..bab2220 100644
--- a/hadoop-common-project/hadoop-common/CHANGES.txt
+++ b/hadoop-common-project/hadoop-common/CHANGES.txt
@@ -750,6 +750,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

http://git-wip-us.apache.org/repos/asf/hadoop/blob/aee45006/hadoop-common-project/hadoop-kms/src/main/conf/kms-acls.xml
----------------------------------------------------------------------
diff --git a/hadoop-common-project/hadoop-kms/src/main/conf/kms-acls.xml b/hadoop-common-project/hadoop-kms/src/main/conf/kms-acls.xml
index 1d5b649..cba69f4 100644
--- a/hadoop-common-project/hadoop-kms/src/main/conf/kms-acls.xml
+++ b/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>

http://git-wip-us.apache.org/repos/asf/hadoop/blob/aee45006/hadoop-common-project/hadoop-kms/src/site/apt/index.apt.vm
----------------------------------------------------------------------
diff --git a/hadoop-common-project/hadoop-kms/src/site/apt/index.apt.vm b/hadoop-common-project/hadoop-kms/src/site/apt/index.apt.vm
index 80d9a48..a2dcce3 100644
--- a/hadoop-common-project/hadoop-kms/src/site/apt/index.apt.vm
+++ b/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>

http://git-wip-us.apache.org/repos/asf/hadoop/blob/aee45006/hadoop-common-project/hadoop-kms/src/test/resources/mini-kms-acls-default.xml
----------------------------------------------------------------------
diff --git a/hadoop-common-project/hadoop-kms/src/test/resources/mini-kms-acls-default.xml
b/hadoop-common-project/hadoop-kms/src/test/resources/mini-kms-acls-default.xml
index 24a46b8..6ac4155 100644
--- a/hadoop-common-project/hadoop-kms/src/test/resources/mini-kms-acls-default.xml
+++ b/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>


Mime
View raw message