svn commit: r1469796 - /accumulo/branches/1.5/core/src/main/java/org/apache/accumulo/core/util/shell/commands/MergeCommand.java

[ecn]

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)