svn commit: r1431413 - /accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/shell/commands/MergeCommand.java

[ecn]

Author: ecn
Date: Thu Jan 10 15:18:46 2013
New Revision: 1431413

URL: http://svn.apache.org/viewvc?rev=1431413&view=rev
Log:
ACCUMULO-952 confirm a full table merge only when size is not specified

Modified:
    
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/shell/commands/MergeCommand.java

Modified: 
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/shell/commands/MergeCommand.java
URL: 
http://svn.apache.org/viewvc/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/shell/commands/MergeCommand.java?rev=1431413&r1=1431412&r2=1431413&view=diff
==============================================================================
--- 
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/shell/commands/MergeCommand.java
 (original)
+++ 
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/shell/commands/MergeCommand.java
 Thu Jan 10 15:18:46 2013
@@ -47,7 +47,7 @@ public class MergeCommand extends Comman
     if (cl.hasOption(sizeOpt.getOpt())) {
       size = 
AccumuloConfiguration.getMemoryInBytes(cl.getOptionValue(sizeOpt.getOpt()));
     }
-    if (startRow == null && endRow == null) {
+    if (startRow == null && endRow == null && size < 0) {
       shellState.getReader().flushConsole();
       String line = shellState.getReader().readLine("Merge the entire table { 
" + tableName + " } into one tablet (yes|no)? ");
       if (line == null)