Repository: hadoop Updated Branches: refs/heads/branch-2 94a1e68aa -> 75bd79231
HADOOP-11097. kms docs say proxyusers, not proxyuser for config params. (clamb via tucu) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/75bd7923 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/75bd7923 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/75bd7923 Branch: refs/heads/branch-2 Commit: 75bd79231ca30cb7a16107101c175c5b6fa06f56 Parents: 94a1e68 Author: Alejandro Abdelnur <t...@apache.org> Authored: Tue Sep 16 21:47:55 2014 -0700 Committer: Alejandro Abdelnur <t...@apache.org> Committed: Tue Sep 16 23:21:17 2014 -0700 ---------------------------------------------------------------------- hadoop-common-project/hadoop-common/CHANGES.txt | 3 +++ hadoop-common-project/hadoop-kms/src/site/apt/index.apt.vm | 8 ++++---- 2 files changed, 7 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/75bd7923/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 939af25..d6b05f7 100644 --- a/hadoop-common-project/hadoop-common/CHANGES.txt +++ b/hadoop-common-project/hadoop-common/CHANGES.txt @@ -483,6 +483,9 @@ Release 2.6.0 - UNRELEASED HADOOP-11096. KMS: KeyAuthorizationKeyProvider should verify the keyversion belongs to the keyname on decrypt. (tucu) + HADOOP-11097. kms docs say proxyusers, not proxyuser for config params. + (clamb via tucu) + Release 2.5.1 - 2014-09-05 INCOMPATIBLE CHANGES http://git-wip-us.apache.org/repos/asf/hadoop/blob/75bd7923/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 be6c8f1..02ca1c5 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 @@ -197,22 +197,22 @@ hadoop-${project.version} $ sbin/kms.sh start *** KMS Proxyuser Configuration - Each proxyusers must be configured in <<<etc/hadoop/kms-site.xml>>> using the + Each proxyuser must be configured in <<<etc/hadoop/kms-site.xml>>> using the following properties: +---+ <property> - <name>hadoop.kms.proxyusers.#USER#.users</name> + <name>hadoop.kms.proxyuser.#USER#.users</name> <value>*</value> </property> <property> - <name>hadoop.kms.proxyusers.#USER#.groups</name> + <name>hadoop.kms.proxyuser.#USER#.groups</name> <value>*</value> </property> <property> - <name>hadoop.kms.proxyusers.#USER#.hosts</name> + <name>hadoop.kms.proxyuser.#USER#.hosts</name> <value>*</value> </property> +---+
