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 zh...@apache.org on 2015/01/26 18:44:40 UTC
[25/50] [abbrv] hadoop git commit: HADOOP-11493. Fix some typos in
kms-acls.xml description. (Contributed by Charles Lamb)
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/c265a0e3
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/c265a0e3
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/c265a0e3
Branch: refs/heads/HDFS-EC
Commit: c265a0e3f687ae0cda01577f91c9401575545eac
Parents: d3b92a1
Author: Akira Ajisaka <aa...@apache.org>
Authored: Fri Jan 23 11:48:19 2015 +0900
Committer: Zhe Zhang <zh...@apache.org>
Committed: Mon Jan 26 09:43:28 2015 -0800
----------------------------------------------------------------------
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/c265a0e3/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/c265a0e3/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/c265a0e3/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/c265a0e3/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>