Return-Path: X-Original-To: apmail-accumulo-commits-archive@www.apache.org Delivered-To: apmail-accumulo-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 BA4F910565 for ; Fri, 19 Apr 2013 12:03:40 +0000 (UTC) Received: (qmail 61468 invoked by uid 500); 19 Apr 2013 12:03:40 -0000 Delivered-To: apmail-accumulo-commits-archive@accumulo.apache.org Received: (qmail 61386 invoked by uid 500); 19 Apr 2013 12:03:38 -0000 Mailing-List: contact commits-help@accumulo.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@accumulo.apache.org Delivered-To: mailing list commits@accumulo.apache.org Received: (qmail 61359 invoked by uid 99); 19 Apr 2013 12:03:37 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 19 Apr 2013 12:03:37 +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; Fri, 19 Apr 2013 12:03:36 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 914D923888CD; Fri, 19 Apr 2013 12:03:16 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1469796 - /accumulo/branches/1.5/core/src/main/java/org/apache/accumulo/core/util/shell/commands/MergeCommand.java Date: Fri, 19 Apr 2013 12:03:16 -0000 To: commits@accumulo.apache.org From: ecn@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20130419120316.914D923888CD@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: ecn Date: Fri Apr 19 12:03:16 2013 New Revision: 1469796 URL: http://svn.apache.org/r1469796 Log: ACCUMULO-952 use the correct argument (--all) to avoid prompting the user Modified: accumulo/branches/1.5/core/src/main/java/org/apache/accumulo/core/util/shell/commands/MergeCommand.java Modified: accumulo/branches/1.5/core/src/main/java/org/apache/accumulo/core/util/shell/commands/MergeCommand.java URL: http://svn.apache.org/viewvc/accumulo/branches/1.5/core/src/main/java/org/apache/accumulo/core/util/shell/commands/MergeCommand.java?rev=1469796&r1=1469795&r2=1469796&view=diff ============================================================================== --- accumulo/branches/1.5/core/src/main/java/org/apache/accumulo/core/util/shell/commands/MergeCommand.java (original) +++ accumulo/branches/1.5/core/src/main/java/org/apache/accumulo/core/util/shell/commands/MergeCommand.java Fri Apr 19 12:03:16 2013 @@ -51,7 +51,7 @@ public class MergeCommand extends Comman if (cl.hasOption(sizeOpt.getOpt())) { size = AccumuloConfiguration.getMemoryInBytes(cl.getOptionValue(sizeOpt.getOpt())); } - if (startRow == null && endRow == null && size < 0 && !force) { + if (startRow == null && endRow == null && size < 0 && !all) { shellState.getReader().flushConsole(); String line = shellState.getReader().readLine("Merge the entire table { " + tableName + " } into one tablet (yes|no)? "); if (line == null)