BUG-16126. Fixed the merge conflict caused by MAPREDUCE-5818.

hadoop-mapreduce-project/CHANGES.txt

@@ -10,7 +10,9 @@ Release 2.4.1 - UNRELEASED
 
   OPTIMIZATIONS
 
-  BUG FIXES 
+  BUG FIXES
+
+    MAPREDUCE-5818. Added "hsadmin" command into mapred.cmd. (Jian He via zjshen)
 
 Release 2.4.0 - 2014-04-07 
 

hadoop-mapreduce-project/bin/mapred.cmd

@@ -155,6 +155,10 @@ goto :eof
   set CLASSPATH=%CLASSPATH%;%TOO_PATH%
   set HADOOP_OPTS=%HADOOP_OPTS% %HADOOP_CLIENT_OPTS%
 
+:hsadmin
+  set CLASS=org.apache.hadoop.mapreduce.v2.hs.client.HSAdmin
+  set HADOOP_OPTS=%HADOOP_OPTS% %HADOOP_CLIENT_OPTS%
+
 :mradmin
   goto not_supported
 
@@ -218,6 +222,7 @@ goto :eof
   @echo   jobhistoryserver        run job history servers as a standalone daemon
   @echo   distcp ^<srcurl^> ^<desturl^> copy file or directories recursively
   @echo   archive -archiveName NAME -p ^<parent path^> ^<src^>* ^<dest^> create a hadoop archive
+  @echo   hsadmin              job history server admin interface
   @echo 
   @echo Most commands print help when invoked w/o parameters.