svn commit: r1563245 - in /hadoop/common/branches/branch-2/hadoop-common-project: hadoop-annotations/src/main/java/org/apache/hadoop/classification/InterfaceStability.java hadoop-common/CHANGES.txt

[cnauroth]

Author: cnauroth
Date: Fri Jan 31 20:17:55 2014
New Revision: 1563245

URL: http://svn.apache.org/r1563245
Log:
HADOOP-10320. Merging change r1563237 from trunk to branch-2.

Modified:
    
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-annotations/src/main/java/org/apache/hadoop/classification/InterfaceStability.java
    
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt

Modified: 
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-annotations/src/main/java/org/apache/hadoop/classification/InterfaceStability.java
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-common-project/hadoop-annotations/src/main/java/org/apache/hadoop/classification/InterfaceStability.java?rev=1563245&r1=1563244&r2=1563245&view=diff
==============================================================================
--- 
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-annotations/src/main/java/org/apache/hadoop/classification/InterfaceStability.java
 (original)
+++ 
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-annotations/src/main/java/org/apache/hadoop/classification/InterfaceStability.java
 Fri Jan 31 20:17:55 2014
@@ -22,6 +22,7 @@ import java.lang.annotation.Documented;
 /**
  * Annotation to inform users of how much to rely on a particular package,
  * class or method not changing over time.
+ * </ul>
  */
 @InterfaceAudience.Public
 @InterfaceStability.Evolving

Modified: 
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt?rev=1563245&r1=1563244&r2=1563245&view=diff
==============================================================================
--- 
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt 
(original)
+++ 
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt 
Fri Jan 31 20:17:55 2014
@@ -18,6 +18,9 @@ Release 2.4.0 - UNRELEASED
 
   BUG FIXES
 
+    HADOOP-10320. Javadoc in InterfaceStability.java lacks final </ul>.
+    (René Nyffenegger via cnauroth)
+
 Release 2.3.0 - UNRELEASED
 
   INCOMPATIBLE CHANGES