Repository: hadoop Updated Branches: refs/heads/branch-2.6 3faabf205 -> 0d573cc4c
HADOOP-11265. Credential and Key Shell Commands not available on Windows. Contributed by Larry McCay. (cherry picked from commit a7fbd4e633c18aeeda93c0f013c0a1fcd5963556) (cherry picked from commit a339fd364664bb9a5b791312846b0f307a1276bc) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/0d573cc4 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/0d573cc4 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/0d573cc4 Branch: refs/heads/branch-2.6 Commit: 0d573cc4c075327b789ed9acc499194c2d29157b Parents: 3faabf2 Author: cnauroth <cnaur...@apache.org> Authored: Wed Nov 5 08:38:50 2014 -0800 Committer: cnauroth <cnaur...@apache.org> Committed: Wed Nov 5 08:45:13 2014 -0800 ---------------------------------------------------------------------- hadoop-common-project/hadoop-common/CHANGES.txt | 2 ++ .../hadoop-common/src/main/bin/hadoop.cmd | 12 +++++++++++- 2 files changed, 13 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/0d573cc4/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 04c8415..1f78fb2 100644 --- a/hadoop-common-project/hadoop-common/CHANGES.txt +++ b/hadoop-common-project/hadoop-common/CHANGES.txt @@ -669,6 +669,8 @@ Release 2.6.0 - UNRELEASED HADOOP-11241. Fixed intermittent TestNMSimulator failure due to timing issue. (Varun Vasudev via zjshen) + HADOOP-11265. Credential and Key Shell Commands not available on Windows. + (Larry McCay via cnauroth) Release 2.5.2 - UNRELEASED http://git-wip-us.apache.org/repos/asf/hadoop/blob/0d573cc4/hadoop-common-project/hadoop-common/src/main/bin/hadoop.cmd ---------------------------------------------------------------------- diff --git a/hadoop-common-project/hadoop-common/src/main/bin/hadoop.cmd b/hadoop-common-project/hadoop-common/src/main/bin/hadoop.cmd index 04a302c..f0693c8 100644 --- a/hadoop-common-project/hadoop-common/src/main/bin/hadoop.cmd +++ b/hadoop-common-project/hadoop-common/src/main/bin/hadoop.cmd @@ -122,7 +122,7 @@ call :updatepath %HADOOP_BIN_PATH% ) ) - set corecommands=fs version jar checknative distcp daemonlog archive classpath + set corecommands=fs version jar checknative distcp daemonlog archive classpath credential key for %%i in ( %corecommands% ) do ( if %hadoop-command% == %%i set corecommand=true ) @@ -182,6 +182,14 @@ call :updatepath %HADOOP_BIN_PATH% set CLASS=org.apache.hadoop.util.Classpath goto :eof +:credential + set CLASS=org.apache.hadoop.security.alias.CredentialShell + goto :eof + +:key + set CLASS=org.apache.hadoop.crypto.key.KeyShell + goto :eof + :updatepath set path_to_add=%* set current_path_comparable=%path% @@ -238,6 +246,8 @@ call :updatepath %HADOOP_BIN_PATH% @echo archive -archiveName NAME -p ^<parent path^> ^<src^>* ^<dest^> create a hadoop archive @echo classpath prints the class path needed to get the @echo Hadoop jar and the required libraries + @echo credential interact with credential providers + @echo key manage keys via the KeyProvider @echo daemonlog get/set the log level for each daemon @echo or @echo CLASSNAME run the class named CLASSNAME
