Return-Path: X-Original-To: apmail-hadoop-common-commits-archive@www.apache.org Delivered-To: apmail-hadoop-common-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 58C5E7977 for ; Thu, 6 Oct 2011 06:35:15 +0000 (UTC) Received: (qmail 82408 invoked by uid 500); 6 Oct 2011 06:35:15 -0000 Delivered-To: apmail-hadoop-common-commits-archive@hadoop.apache.org Received: (qmail 82379 invoked by uid 500); 6 Oct 2011 06:35:15 -0000 Mailing-List: contact common-commits-help@hadoop.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: common-dev@hadoop.apache.org Delivered-To: mailing list common-commits@hadoop.apache.org Received: (qmail 82372 invoked by uid 99); 6 Oct 2011 06:35:15 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 06 Oct 2011 06:35:15 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 06 Oct 2011 06:35:12 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id C055223888E4 for ; Thu, 6 Oct 2011 06:34:51 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1179519 - in /hadoop/common/branches/branch-0.20-security: CHANGES.txt src/hdfs/org/apache/hadoop/hdfs/DFSClient.java Date: Thu, 06 Oct 2011 06:34:51 -0000 To: common-commits@hadoop.apache.org From: atm@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20111006063451.C055223888E4@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: atm Date: Thu Oct 6 06:34:51 2011 New Revision: 1179519 URL: http://svn.apache.org/viewvc?rev=1179519&view=rev Log: HDFS-2408. DFSClient#getNumCurrentReplicas is package private in 205 but public in branch-0.20-append (stack via atm) Modified: hadoop/common/branches/branch-0.20-security/CHANGES.txt hadoop/common/branches/branch-0.20-security/src/hdfs/org/apache/hadoop/hdfs/DFSClient.java Modified: hadoop/common/branches/branch-0.20-security/CHANGES.txt URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security/CHANGES.txt?rev=1179519&r1=1179518&r2=1179519&view=diff ============================================================================== --- hadoop/common/branches/branch-0.20-security/CHANGES.txt (original) +++ hadoop/common/branches/branch-0.20-security/CHANGES.txt Thu Oct 6 06:34:51 2011 @@ -298,6 +298,9 @@ Release 0.20.205.0 - unreleased 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) Modified: hadoop/common/branches/branch-0.20-security/src/hdfs/org/apache/hadoop/hdfs/DFSClient.java URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security/src/hdfs/org/apache/hadoop/hdfs/DFSClient.java?rev=1179519&r1=1179518&r2=1179519&view=diff ============================================================================== --- hadoop/common/branches/branch-0.20-security/src/hdfs/org/apache/hadoop/hdfs/DFSClient.java (original) +++ hadoop/common/branches/branch-0.20-security/src/hdfs/org/apache/hadoop/hdfs/DFSClient.java Thu Oct 6 06:34:51 2011 @@ -3569,7 +3569,7 @@ public class DFSClient implements FSCons * 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;