Merge branch '1.6.0-SNAPSHOT' of https://git-wip-us.apache.org/repos/asf/accumulo into 1.6.0-SNAPSHOT
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/2a8e146e Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/2a8e146e Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/2a8e146e Branch: refs/heads/1.6.0-SNAPSHOT Commit: 2a8e146e9b3b47087d5f49430a163d0f39245989 Parents: c91647e ae20140 Author: Josh Elser <els...@apache.org> Authored: Mon Feb 3 19:10:29 2014 -0500 Committer: Josh Elser <els...@apache.org> Committed: Mon Feb 3 19:10:29 2014 -0500 ---------------------------------------------------------------------- .../org/apache/accumulo/core/cli/ClientOpts.java | 5 +++-- .../accumulo/core/util/shell/ShellOptionsJC.java | 3 ++- .../test/randomwalk/concurrent/CloneTable.java | 18 +++++++++++++----- 3 files changed, 18 insertions(+), 8 deletions(-) ----------------------------------------------------------------------
