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

[ecn]

Author: ecn
Date: Fri Apr 19 14:31:35 2013
New Revision: 1469851

URL: http://svn.apache.org/r1469851
Log:
ACCUMULO-952 --all flag not being used

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=1469851&r1=1469850&r2=1469851&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 14:31:35 2013
@@ -46,7 +46,7 @@ public class MergeCommand extends Comman
       force = true;
     }
     if (cl.hasOption(allOpt.getOpt())) {
-      force = true;
+      all = true;
     }
     if (cl.hasOption(sizeOpt.getOpt())) {
       size = 
AccumuloConfiguration.getMemoryInBytes(cl.getOptionValue(sizeOpt.getOpt()));