Merge branch 'ACCUMULO-4138' into 1.6
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/eb0f9b41 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/eb0f9b41 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/eb0f9b41 Branch: refs/heads/1.7 Commit: eb0f9b418fcd538702c4a2aff109f314f0e00de8 Parents: a75c685 4d23d78 Author: Christopher Tubbs <ctubb...@apache.org> Authored: Fri Feb 19 21:30:51 2016 -0500 Committer: Christopher Tubbs <ctubb...@apache.org> Committed: Fri Feb 19 21:30:51 2016 -0500 ---------------------------------------------------------------------- .../core/client/admin/TableOperations.java | 4 +-- .../util/shell/commands/DeleteRowsCommand.java | 4 +-- .../core/util/shell/commands/MergeCommand.java | 4 +-- .../core/util/shell/commands/OptUtil.java | 2 +- .../core/util/shell/commands/ScanCommand.java | 5 +++- .../util/shell/commands/CompactCommandTest.java | 29 ++++++++++++++++++++ .../shell/commands/DeleteManyCommandTest.java | 29 ++++++++++++++++++++ .../shell/commands/DeleteRowsCommandTest.java | 29 ++++++++++++++++++++ .../util/shell/commands/FlushCommandTest.java | 29 ++++++++++++++++++++ .../util/shell/commands/MergeCommandTest.java | 29 ++++++++++++++++++++ .../util/shell/commands/ScanCommandTest.java | 29 ++++++++++++++++++++ 11 files changed, 183 insertions(+), 10 deletions(-) ----------------------------------------------------------------------
