HDFS-6157. Merge r1582098 from trunk.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1582100 13f79535-47bb-0310-9956-ffa450edef68

hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt

@@ -474,6 +474,8 @@ Release 2.4.0 - UNRELEASED
 
     HDFS-5672. TestHASafeMode#testSafeBlockTracking fails in trunk. (jing9)
 
+    HDFS-6157. Fix the entry point of OfflineImageViewer for hdfs.cmd. (wheat9)
+
   BREAKDOWN OF HDFS-5698 SUBTASKS AND RELATED JIRAS
 
     HDFS-5717. Save FSImage header in protobuf. (Haohui Mai via jing9)

hadoop-hdfs-project/hadoop-hdfs/src/main/bin/hdfs.cmd

@@ -119,7 +119,7 @@ goto :eof
   goto :eof
 
 :oiv
-  set CLASS=org.apache.hadoop.hdfs.tools.offlineImageViewer.OfflineImageViewer
+  set CLASS=org.apache.hadoop.hdfs.tools.offlineImageViewer.OfflineImageViewerPB
   goto :eof
 
 :oev