Apache
/
hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HADOOP-11609. Correct credential commands info in CommandsManual.html#credential. Contributed by Varun Saxena. 

(cherry picked from commit 6e891a921e)
This commit is contained in:
Tsuyoshi Ozawa 2015-03-24 20:57:39 +09:00
parent da318cbbde
commit 913fdea4e2
3 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
hadoop-common-project/hadoop-common/CHANGES.txt
View File

@ -686,6 +686,9 @@ Release 2.7.0 - UNRELEASED
HADOOP-11729. Fix link to cgroups doc in site.xml. (Masatake Iwasaki via HADOOP-11729. Fix link to cgroups doc in site.xml. (Masatake Iwasaki via
ozawa) ozawa)
HADOOP-11609. Correct credential commands info in
CommandsManual.html#credential. (Varun Saxena via ozawa)
Release 2.6.1 - UNRELEASED Release 2.6.1 - UNRELEASED
INCOMPATIBLE CHANGES INCOMPATIBLE CHANGES

2
hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/alias/CredentialShell.java
View File

@ -81,7 +81,7 @@ public class CredentialShell extends Configured implements Tool {
* <pre> * <pre>
* % hadoop credential create alias [-provider providerPath] * % hadoop credential create alias [-provider providerPath]
* % hadoop credential list [-provider providerPath] * % hadoop credential list [-provider providerPath]
* % hadoop credential delete alias [-provider providerPath] [-i] * % hadoop credential delete alias [-provider providerPath] [-f]
* </pre> * </pre>
* @param args * @param args
* @return 0 if the argument(s) were recognized, 1 otherwise * @return 0 if the argument(s) were recognized, 1 otherwise

4
hadoop-common-project/hadoop-common/src/site/markdown/CommandsManual.md
View File

@ -106,8 +106,8 @@ Usage: `hadoop credential <subcommand> [options]`
| COMMAND\_OPTION | Description | | COMMAND\_OPTION | Description |
|:---- |:---- | |:---- |:---- |
| create *alias* [-v *value*][-provider *provider-path*] | Prompts the user for a credential to be stored as the given alias when a value is not provided via `-v`. The *hadoop.security.credential.provider.path* within the core-site.xml file will be used unless a `-provider` is indicated. | | create *alias* [-provider *provider-path*] | Prompts the user for a credential to be stored as the given alias. The *hadoop.security.credential.provider.path* within the core-site.xml file will be used unless a `-provider` is indicated. |
| delete *alias* [-i][-provider *provider-path*] | Deletes the credential with the provided alias and optionally warns the user when `--interactive` is used. The *hadoop.security.credential.provider.path* within the core-site.xml file will be used unless a `-provider` is indicated. | | delete *alias* [-provider *provider-path*] [-f] | Deletes the credential with the provided alias. The *hadoop.security.credential.provider.path* within the core-site.xml file will be used unless a `-provider` is indicated. The command asks for confirmation unless `-f` is specified |
| list [-provider *provider-path*] | Lists all of the credential aliases The *hadoop.security.credential.provider.path* within the core-site.xml file will be used unless a `-provider` is indicated. | | list [-provider *provider-path*] | Lists all of the credential aliases The *hadoop.security.credential.provider.path* within the core-site.xml file will be used unless a `-provider` is indicated. |
Command to manage credentials, passwords and secrets within credential providers. Command to manage credentials, passwords and secrets within credential providers.