HADOOP-10320. Merging change r1563237 from trunk to branch-2.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1563245 13f79535-47bb-0310-9956-ffa450edef68
2014-01-31 20:17:55 +00:00 · 2014-01-31 20:17:55 +00:00 · 6cda3a7f97
parent d58cd5d2d0
commit 6cda3a7f97
2 changed files with 4 additions and 0 deletions
--- a/hadoop-common-project/hadoop-annotations/src/main/java/org/apache/hadoop/classification/InterfaceStability.java
+++ b/hadoop-common-project/hadoop-annotations/src/main/java/org/apache/hadoop/classification/InterfaceStability.java
@ -22,6 +22,7 @@
 /**
 * 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
--- a/hadoop-common-project/hadoop-common/CHANGES.txt
+++ b/hadoop-common-project/hadoop-common/CHANGES.txt
@ -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