Merge -r 1296522:1296523 from trunk to branch-23. Fixes: MAPREDUCE-3935.

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

hadoop-mapreduce-project/CHANGES.txt

@@ -25,6 +25,9 @@ Release 0.23.3 - UNRELEASED
     MAPREDUCE-3885. Avoid an unnecessary copy for all requests/responses in 
     MRs ProtoOverHadoopRpcEngine. (Devaraj Das via sseth)
 
+	MAPREDUCE-3935. Annotate Counters.Counter and Counters.Group as @Public.
+    (tomwhite)
+
   OPTIMIZATIONS
 
   BUG FIXES

hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapred/Counters.java

@@ -96,6 +96,8 @@ public class Counters
   /**
    * A counter record, comprising its name and value.
    */
+  @InterfaceAudience.Public
+  @InterfaceStability.Stable
   public static class Counter implements org.apache.hadoop.mapreduce.Counter {
     org.apache.hadoop.mapreduce.Counter realCounter;
 
@@ -207,6 +209,8 @@ public class Counters
    *  <p><code>Group</code>handles localization of the class name and the
    *  counter names.</p>
    */
+  @InterfaceAudience.Public
+  @InterfaceStability.Stable
   public static class Group implements CounterGroupBase<Counter> {
     private CounterGroupBase<Counter> realGroup;