HADOOP-9563. Merge change 1482709 from trunk

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

hadoop-common-project/hadoop-common/CHANGES.txt

@@ -168,6 +168,9 @@ Release 2.0.5-beta - UNRELEASED
     HADOOP-9220. Unnecessary transition to standby in ActiveStandbyElector.
     (tom and todd via todd)
 
+    HADOOP-9563. Fix incompatibility introduced by HADOOP-9523.
+    (Tian Hong Wang via suresh)
+
 Release 2.0.4-alpha - 2013-04-25 
 
   INCOMPATIBLE CHANGES

hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/PlatformName.java

@@ -25,7 +25,7 @@ import org.apache.hadoop.classification.InterfaceStability;
  * A helper class for getting build-info of the java-vm. 
  * 
  */
-@InterfaceAudience.Private
+@InterfaceAudience.LimitedPrivate({"HBase"})
 @InterfaceStability.Unstable
 public class PlatformName {
   /**
@@ -48,7 +48,6 @@ public class PlatformName {
   public static final boolean IBM_JAVA = JAVA_VENDOR_NAME.contains("IBM");
   
   public static void main(String[] args) {
-    System.out.println("platform name: " + PLATFORM_NAME);
-    System.out.println("java vendor name: " + JAVA_VENDOR_NAME);
+    System.out.println(PLATFORM_NAME);
   }
 }