HDFS-629. Merge -r 816987:816988 from trunk to branch 0.21.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/hdfs/trunk@817353 13f79535-47bb-0310-9956-ffa450edef68

CHANGES.txt

@@ -12,9 +12,6 @@ Trunk (unreleased changes)
 
   BUG FIXES
 
-    HDFS-629. Remove ReplicationTargetChooser.java along with fixing 
-    import warnings generated by Eclipse. (dhruba)
-
 
 Release 0.21.0 - Unreleased
 
@@ -279,6 +276,9 @@ Release 0.21.0 - Unreleased
 
     HDFS-622. checkMinReplication should count live nodes only. (shv)
 
+    HDFS-629. Remove ReplicationTargetChooser.java along with fixing 
+    import warnings generated by Eclipse. (dhruba)
+
 Release 0.20.1 - 2009-09-01
 
   IMPROVEMENTS