Author: cnauroth Date: Fri Aug 9 00:11:34 2013 New Revision: 1512108 URL: http://svn.apache.org/r1512108 Log: HADOOP-9831. Merging change r1512105 from branch-2 to branch-2.1-beta.
Modified: hadoop/common/branches/branch-2.1-beta/hadoop-common-project/hadoop-common/CHANGES.txt hadoop/common/branches/branch-2.1-beta/hadoop-common-project/hadoop-common/src/main/bin/hadoop.cmd Modified: hadoop/common/branches/branch-2.1-beta/hadoop-common-project/hadoop-common/CHANGES.txt URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2.1-beta/hadoop-common-project/hadoop-common/CHANGES.txt?rev=1512108&r1=1512107&r2=1512108&view=diff ============================================================================== --- hadoop/common/branches/branch-2.1-beta/hadoop-common-project/hadoop-common/CHANGES.txt (original) +++ hadoop/common/branches/branch-2.1-beta/hadoop-common-project/hadoop-common/CHANGES.txt Fri Aug 9 00:11:34 2013 @@ -35,6 +35,8 @@ Release 2.1.1-beta - UNRELEASED HADOOP-9315. Port HADOOP-9249 hadoop-maven-plugins Clover fix to branch-2 to fix build failures. (Dennis Y via cnauroth) + HADOOP-9831. Make checknative shell command accessible on Windows. (cnauroth) + Release 2.1.0-beta - 2013-08-06 INCOMPATIBLE CHANGES Modified: hadoop/common/branches/branch-2.1-beta/hadoop-common-project/hadoop-common/src/main/bin/hadoop.cmd URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2.1-beta/hadoop-common-project/hadoop-common/src/main/bin/hadoop.cmd?rev=1512108&r1=1512107&r2=1512108&view=diff ============================================================================== --- hadoop/common/branches/branch-2.1-beta/hadoop-common-project/hadoop-common/src/main/bin/hadoop.cmd (original) +++ hadoop/common/branches/branch-2.1-beta/hadoop-common-project/hadoop-common/src/main/bin/hadoop.cmd Fri Aug 9 00:11:34 2013 @@ -119,7 +119,7 @@ call :updatepath %HADOOP_BIN_PATH% goto :eof ) - set corecommands=fs version jar distcp daemonlog archive + set corecommands=fs version jar checknative distcp daemonlog archive for %%i in ( %corecommands% ) do ( if %hadoop-command% == %%i set corecommand=true ) @@ -157,6 +157,10 @@ call :updatepath %HADOOP_BIN_PATH% set CLASS=org.apache.hadoop.util.RunJar goto :eof +:checknative + set CLASS=org.apache.hadoop.util.NativeLibraryChecker + goto :eof + :distcp set CLASS=org.apache.hadoop.tools.DistCp set CLASSPATH=%CLASSPATH%;%TOOL_PATH% @@ -222,6 +226,7 @@ call :updatepath %HADOOP_BIN_PATH% @echo fs run a generic filesystem user client @echo version print the version @echo jar ^<jar^> run a jar file + @echo checknative [-a^|-h] check native hadoop and compression libraries availability @echo distcp ^<srcurl^> ^<desturl^> copy file or directories recursively @echo archive -archiveName NAME -p ^<parent path^> ^<src^>* ^<dest^> create a hadoop archive @echo classpath prints the class path needed to get the