diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt b/hadoop-common-project/hadoop-common/CHANGES.txt index 9324acda2f..11151f0223 100644 --- a/hadoop-common-project/hadoop-common/CHANGES.txt +++ b/hadoop-common-project/hadoop-common/CHANGES.txt @@ -818,6 +818,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 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 c76ca3b30a..d70f2a6d62 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 <<>> using the + Each proxyuser must be configured in <<>> using the following properties: +---+ - hadoop.kms.proxyusers.#USER#.users + hadoop.kms.proxyuser.#USER#.users * - hadoop.kms.proxyusers.#USER#.groups + hadoop.kms.proxyuser.#USER#.groups * - hadoop.kms.proxyusers.#USER#.hosts + hadoop.kms.proxyuser.#USER#.hosts * +---+