Merge branch '1.7'
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/869e73b7 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/869e73b7 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/869e73b7 Branch: refs/heads/master Commit: 869e73b7557e44efc887d3967eaaa699862450bb Parents: e205502 4678cf9 Author: Christopher Tubbs <ctubb...@apache.org> Authored: Fri Feb 19 21:58:44 2016 -0500 Committer: Christopher Tubbs <ctubb...@apache.org> Committed: Fri Feb 19 21:58:44 2016 -0500 ---------------------------------------------------------------------- .../core/client/admin/TableOperations.java | 4 +-- .../shell/commands/DeleteRowsCommand.java | 4 +-- .../accumulo/shell/commands/MergeCommand.java | 4 +-- .../apache/accumulo/shell/commands/OptUtil.java | 2 +- .../accumulo/shell/commands/ScanCommand.java | 5 +++- .../shell/commands/CompactCommandTest.java | 29 ++++++++++++++++++++ .../shell/commands/DeleteManyCommandTest.java | 29 ++++++++++++++++++++ .../shell/commands/DeleteRowsCommandTest.java | 29 ++++++++++++++++++++ .../shell/commands/FlushCommandTest.java | 29 ++++++++++++++++++++ .../shell/commands/MergeCommandTest.java | 29 ++++++++++++++++++++ .../shell/commands/ScanCommandTest.java | 29 ++++++++++++++++++++ 11 files changed, 183 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/869e73b7/core/src/main/java/org/apache/accumulo/core/client/admin/TableOperations.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/869e73b7/shell/src/main/java/org/apache/accumulo/shell/commands/ScanCommand.java ----------------------------------------------------------------------
