Return-Path: Delivered-To: apmail-hadoop-hdfs-commits-archive@minotaur.apache.org Received: (qmail 84733 invoked from network); 13 Oct 2009 02:05:32 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 13 Oct 2009 02:05:32 -0000 Received: (qmail 64192 invoked by uid 500); 13 Oct 2009 02:05:32 -0000 Delivered-To: apmail-hadoop-hdfs-commits-archive@hadoop.apache.org Received: (qmail 64155 invoked by uid 500); 13 Oct 2009 02:05:32 -0000 Mailing-List: contact hdfs-commits-help@hadoop.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: hdfs-dev@hadoop.apache.org Delivered-To: mailing list hdfs-commits@hadoop.apache.org Received: (qmail 64145 invoked by uid 99); 13 Oct 2009 02:05:32 -0000 Received: from Unknown (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 13 Oct 2009 02:05:32 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.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; Tue, 13 Oct 2009 02:05:14 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id A71A923888DB; Tue, 13 Oct 2009 02:04:53 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r824567 - in /hadoop/hdfs/branches/branch-0.21: CHANGES.txt src/java/org/apache/hadoop/hdfs/tools/DFSAdmin.java Date: Tue, 13 Oct 2009 02:04:53 -0000 To: hdfs-commits@hadoop.apache.org From: shv@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20091013020453.A71A923888DB@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: shv Date: Tue Oct 13 02:04:53 2009 New Revision: 824567 URL: http://svn.apache.org/viewvc?rev=824567&view=rev Log: HDFS-688. Merge -r 824565:824566 from trunk to branch-0.21. Modified: hadoop/hdfs/branches/branch-0.21/CHANGES.txt hadoop/hdfs/branches/branch-0.21/src/java/org/apache/hadoop/hdfs/tools/DFSAdmin.java Modified: hadoop/hdfs/branches/branch-0.21/CHANGES.txt URL: http://svn.apache.org/viewvc/hadoop/hdfs/branches/branch-0.21/CHANGES.txt?rev=824567&r1=824566&r2=824567&view=diff ============================================================================== --- hadoop/hdfs/branches/branch-0.21/CHANGES.txt (original) +++ hadoop/hdfs/branches/branch-0.21/CHANGES.txt Tue Oct 13 02:04:53 2009 @@ -251,6 +251,8 @@ HDFS-663. DFSIO for append. (shv) + HDFS-688. Add configuration resources to DFSAdmin. (shv) + BUG FIXES HDFS-76. Better error message to users when commands fail because of Modified: hadoop/hdfs/branches/branch-0.21/src/java/org/apache/hadoop/hdfs/tools/DFSAdmin.java URL: http://svn.apache.org/viewvc/hadoop/hdfs/branches/branch-0.21/src/java/org/apache/hadoop/hdfs/tools/DFSAdmin.java?rev=824567&r1=824566&r2=824567&view=diff ============================================================================== --- hadoop/hdfs/branches/branch-0.21/src/java/org/apache/hadoop/hdfs/tools/DFSAdmin.java (original) +++ hadoop/hdfs/branches/branch-0.21/src/java/org/apache/hadoop/hdfs/tools/DFSAdmin.java Tue Oct 13 02:04:53 2009 @@ -54,6 +54,11 @@ */ public class DFSAdmin extends FsShell { + static{ + Configuration.addDefaultResource("hdfs-default.xml"); + Configuration.addDefaultResource("hdfs-site.xml"); + } + /** * An abstract class for the execution of a file system command */