Repository: hadoop Updated Branches: refs/heads/branch-2 c3e2c20c9 -> a732b58be
HADOOP-11609. Correct credential commands info in CommandsManual.html#credential. Contributed by Varun Saxena. (cherry picked from commit 6e891a921e00b122390a976dfd13838472a7fcc6) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/a732b58b Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/a732b58b Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/a732b58b Branch: refs/heads/branch-2 Commit: a732b58bebd3592144dc138effb02180ebc98016 Parents: c3e2c20 Author: Tsuyoshi Ozawa <oz...@apache.org> Authored: Tue Mar 24 20:57:39 2015 +0900 Committer: Tsuyoshi Ozawa <oz...@apache.org> Committed: Tue Mar 24 20:57:56 2015 +0900 ---------------------------------------------------------------------- hadoop-common-project/hadoop-common/CHANGES.txt | 3 +++ .../java/org/apache/hadoop/security/alias/CredentialShell.java | 2 +- .../hadoop-common/src/site/markdown/CommandsManual.md | 4 ++-- 3 files changed, 6 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/a732b58b/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 ba6ab97..9474f02 100644 --- a/hadoop-common-project/hadoop-common/CHANGES.txt +++ b/hadoop-common-project/hadoop-common/CHANGES.txt @@ -725,6 +725,9 @@ Release 2.7.0 - UNRELEASED HADOOP-11729. Fix link to cgroups doc in site.xml. (Masatake Iwasaki via ozawa) + HADOOP-11609. Correct credential commands info in + CommandsManual.html#credential. (Varun Saxena via ozawa) + Release 2.6.1 - UNRELEASED INCOMPATIBLE CHANGES http://git-wip-us.apache.org/repos/asf/hadoop/blob/a732b58b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/alias/CredentialShell.java ---------------------------------------------------------------------- diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/alias/CredentialShell.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/alias/CredentialShell.java index 7a632c1..3405cb7 100644 --- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/alias/CredentialShell.java +++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/alias/CredentialShell.java @@ -81,7 +81,7 @@ public class CredentialShell extends Configured implements Tool { * <pre> * % hadoop credential create alias [-provider providerPath] * % hadoop credential list [-provider providerPath] - * % hadoop credential delete alias [-provider providerPath] [-i] + * % hadoop credential delete alias [-provider providerPath] [-f] * </pre> * @param args * @return 0 if the argument(s) were recognized, 1 otherwise http://git-wip-us.apache.org/repos/asf/hadoop/blob/a732b58b/hadoop-common-project/hadoop-common/src/site/markdown/CommandsManual.md ---------------------------------------------------------------------- diff --git a/hadoop-common-project/hadoop-common/src/site/markdown/CommandsManual.md b/hadoop-common-project/hadoop-common/src/site/markdown/CommandsManual.md index 3a61445..ae9c442 100644 --- a/hadoop-common-project/hadoop-common/src/site/markdown/CommandsManual.md +++ b/hadoop-common-project/hadoop-common/src/site/markdown/CommandsManual.md @@ -106,8 +106,8 @@ Usage: `hadoop credential <subcommand> [options]` | 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. | -| 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. | +| 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* [-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. | Command to manage credentials, passwords and secrets within credential providers.
