svn merge -c 966919 from trunk

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

CHANGES.txt

@@ -908,25 +908,6 @@ Release 0.21.0 - 2010-07-01
 
   BUG FIXES
 
-    HADOOP-6790. Instrumented (Herriot) build uses too wide mask to include
-    aspect files. (Konstantin Boudnik)
-
-    HADOOP-6860. 'compile-fault-inject' should never be called directly.
-    (Konstantin Boudnik)
-
-    HADOOP-6836. [Herriot]: Generic method for adding/modifying the attributes
-    for new configuration. (Vinay Thota via cos)
-
-    HADOOP-6839. [Herriot] Implement a functionality for getting the user list
-    for creating proxy users. (Vinay Thota via cos)
-
-    HADOOP-6819. [Herriot] Shell command for getting the new exceptions in
-    the logs returning exitcode 1 after executing successfully. (Vinay Thota
-    via cos)
-
-    HADOOP-6847. Problem staging 0.21.0 artifacts to Apache Nexus Maven
-    Repository (Giridharan Kesavan via cos)
-
     HADOOP-6748. Removes hadoop.cluster.administrators, cluster administrators
     acl is passed as parameter in constructor. (amareshwari) 
 
@@ -1587,6 +1568,25 @@ Release 0.21.0 - 2010-07-01
 
     HADOOP-6800.  Harmonize JAR library versions.  (tomwhite)
 
+    HADOOP-6847. Problem staging 0.21.0 artifacts to Apache Nexus Maven
+    Repository (Giridharan Kesavan via cos)
+
+    HADOOP-6819. [Herriot] Shell command for getting the new exceptions in
+    the logs returning exitcode 1 after executing successfully. (Vinay Thota
+    via cos)
+
+    HADOOP-6839. [Herriot] Implement a functionality for getting the user list
+    for creating proxy users. (Vinay Thota via cos)
+
+    HADOOP-6836. [Herriot]: Generic method for adding/modifying the attributes
+    for new configuration. (Vinay Thota via cos)
+
+    HADOOP-6860. 'compile-fault-inject' should never be called directly.
+    (Konstantin Boudnik)
+
+    HADOOP-6790. Instrumented (Herriot) build uses too wide mask to include
+    aspect files. (Konstantin Boudnik)
+
 Release 0.20.3 - Unreleased
 
   NEW FEATURES