[21/50] [abbrv] hadoop git commit: HADOOP-11609. Correct credential commands info in CommandsManual.html#credential. Contributed by Varun Saxena.

2015-03-27 Thread zjshen 
HADOOP-11609. Correct credential commands info in 
CommandsManual.html#credential. Contributed by Varun Saxena.


Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/a8507bec
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/a8507bec
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/a8507bec

Branch: refs/heads/YARN-2928
Commit: a8507bece7350d678e2a5fdca77d2a419905d511
Parents: 37ba77f
Author: Tsuyoshi Ozawa oz...@apache.org
Authored: Tue Mar 24 20:57:39 2015 +0900
Committer: Zhijie Shen zjs...@apache.org
Committed: Thu Mar 26 23:29:45 2015 -0700

--
 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/a8507bec/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 430015d..4f0cf97 100644
--- a/hadoop-common-project/hadoop-common/CHANGES.txt
+++ b/hadoop-common-project/hadoop-common/CHANGES.txt
@@ -1136,6 +1136,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/a8507bec/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 e8a721f..265ed16 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/a8507bec/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 33986ae..207160e 100644
--- a/hadoop-common-project/hadoop-common/src/site/markdown/CommandsManual.md
+++ b/hadoop-common-project/hadoop-common/src/site/markdown/CommandsManual.md
@@ -128,8 +128,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

[32/51] [abbrv] hadoop git commit: HADOOP-11609. Correct credential commands info in CommandsManual.html#credential. Contributed by Varun Saxena.

2015-03-25 Thread kasha 
HADOOP-11609. Correct credential commands info in 
CommandsManual.html#credential. Contributed by Varun Saxena.


Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/6e891a92
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/6e891a92
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/6e891a92

Branch: refs/heads/YARN-2139
Commit: 6e891a921e00b122390a976dfd13838472a7fcc6
Parents: c6c396f
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:39 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/6e891a92/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 430015d..4f0cf97 100644
--- a/hadoop-common-project/hadoop-common/CHANGES.txt
+++ b/hadoop-common-project/hadoop-common/CHANGES.txt
@@ -1136,6 +1136,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/6e891a92/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 e8a721f..265ed16 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/6e891a92/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 33986ae..207160e 100644
--- a/hadoop-common-project/hadoop-common/src/site/markdown/CommandsManual.md
+++ b/hadoop-common-project/hadoop-common/src/site/markdown/CommandsManual.md
@@ -128,8 +128,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

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

2015-03-24 Thread ozawa 
Repository: hadoop
Updated Branches:
  refs/heads/trunk c6c396fcd - 6e891a921


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


Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/6e891a92
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/6e891a92
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/6e891a92

Branch: refs/heads/trunk
Commit: 6e891a921e00b122390a976dfd13838472a7fcc6
Parents: c6c396f
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:39 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/6e891a92/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 430015d..4f0cf97 100644
--- a/hadoop-common-project/hadoop-common/CHANGES.txt
+++ b/hadoop-common-project/hadoop-common/CHANGES.txt
@@ -1136,6 +1136,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/6e891a92/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 e8a721f..265ed16 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/6e891a92/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 33986ae..207160e 100644
--- a/hadoop-common-project/hadoop-common/src/site/markdown/CommandsManual.md
+++ b/hadoop-common-project/hadoop-common/src/site/markdown/CommandsManual.md
@@ -128,8 +128,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

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

2015-03-24 Thread ozawa 
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 git commit: HADOOP-11609. Correct credential commands info in CommandsManual.html#credential. Contributed by Varun Saxena.

2015-03-24 Thread ozawa 
Repository: hadoop
Updated Branches:
  refs/heads/branch-2.7 da318cbbd - 913fdea4e


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/913fdea4
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/913fdea4
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/913fdea4

Branch: refs/heads/branch-2.7
Commit: 913fdea4e2e3220445a16789addb488019bd001a
Parents: da318cb
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:58:13 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/913fdea4/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 f7a7775..60af63f 100644
--- a/hadoop-common-project/hadoop-common/CHANGES.txt
+++ b/hadoop-common-project/hadoop-common/CHANGES.txt
@@ -686,6 +686,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/913fdea4/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/913fdea4/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

[09/50] [abbrv] hadoop git commit: HADOOP-11609. Correct credential commands info in CommandsManual.html#credential. Contributed by Varun Saxena.

2015-03-24 Thread zhz 
HADOOP-11609. Correct credential commands info in 
CommandsManual.html#credential. Contributed by Varun Saxena.


Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/6e891a92
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/6e891a92
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/6e891a92

Branch: refs/heads/HDFS-7285
Commit: 6e891a921e00b122390a976dfd13838472a7fcc6
Parents: c6c396f
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:39 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/6e891a92/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 430015d..4f0cf97 100644
--- a/hadoop-common-project/hadoop-common/CHANGES.txt
+++ b/hadoop-common-project/hadoop-common/CHANGES.txt
@@ -1136,6 +1136,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/6e891a92/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 e8a721f..265ed16 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/6e891a92/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 33986ae..207160e 100644
--- a/hadoop-common-project/hadoop-common/src/site/markdown/CommandsManual.md
+++ b/hadoop-common-project/hadoop-common/src/site/markdown/CommandsManual.md
@@ -128,8 +128,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