`svn merge -c 1179519 https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.20-security' to pick up HDFS-2408

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

CHANGES.txt

@@ -268,6 +268,9 @@ Release 0.20.205.0 - 2011.09.28
 
     HDFS-2392. Dist with hftp is failing again. (Daryn Sharp via jitendra)
 
+    HDFS-2408. DFSClient#getNumCurrentReplicas is package private in 205 but
+               public in branch-0.20-append (stack via atm)
+
   IMPROVEMENTS
 
     MAPREDUCE-2928. MR-2413 improvements (Eli Collins via mattf)

src/hdfs/org/apache/hadoop/hdfs/DFSClient.java

@@ -3569,7 +3569,7 @@ public class DFSClient implements FSConstants, java.io.Closeable {
      * block is not yet allocated, then this API will return 0 because there are
      * no replicas in the pipeline.
      */
-    int getNumCurrentReplicas() throws IOException {
+    public int getNumCurrentReplicas() throws IOException {
       synchronized(dataQueue) {
         if (nodes == null) {
           return blockReplication;