[2/2] git commit: Merge branch '1.5.1-SNAPSHOT'

[mdrob]

Merge branch '1.5.1-SNAPSHOT'

Conflicts:
        
core/src/main/java/org/apache/accumulo/core/util/shell/commands/ScanCommand.java


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/32f423e6
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/32f423e6
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/32f423e6

Branch: refs/heads/master
Commit: 32f423e63028dce700103b3c8fbc54f10c9914da
Parents: 8730d5c d61afcc
Author: Mike Drob <md...@mdrob.com>
Authored: Mon Oct 28 10:20:20 2013 -0400
Committer: Mike Drob <md...@mdrob.com>
Committed: Mon Oct 28 10:20:20 2013 -0400

----------------------------------------------------------------------
 .../accumulo/core/util/shell/commands/GrepCommand.java   |  4 +++-
 .../accumulo/core/util/shell/commands/ScanCommand.java   | 11 +++++++----
 2 files changed, 10 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/32f423e6/core/src/main/java/org/apache/accumulo/core/util/shell/commands/ScanCommand.java
----------------------------------------------------------------------
diff --cc 
core/src/main/java/org/apache/accumulo/core/util/shell/commands/ScanCommand.java
index 21a7842,74aa699..f3a0663
--- 
a/core/src/main/java/org/apache/accumulo/core/util/shell/commands/ScanCommand.java
+++ 
b/core/src/main/java/org/apache/accumulo/core/util/shell/commands/ScanCommand.java
@@@ -56,12 -58,9 +57,9 @@@ public class ScanCommand extends Comman
    private Option timeoutOption;
    private Option profileOpt;
    
 +  @Override
    public int execute(final String fullCommand, final CommandLine cl, final 
Shell shellState) throws Exception {
-     
-     final String outputFile = cl.getOptionValue(outputFileOpt.getOpt());
-     final PrintFile printFile = outputFile == null ? null : new 
PrintFile(outputFile);
-     
+     final PrintFile printFile = getOutputFile(cl);
 -    
      final String tableName = OptUtil.getTableOpt(cl, shellState);
      
      final Class<? extends Formatter> formatter = getFormatter(cl, tableName, 
shellState);