Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/accumulo
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/5aef9aee Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/5aef9aee Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/5aef9aee Branch: refs/heads/master Commit: 5aef9aeec64aa7566ec39d89fe753b5a5f7c43e7 Parents: c95ccde d13cc76 Author: Josh Elser <els...@apache.org> Authored: Mon Feb 3 19:18:07 2014 -0500 Committer: Josh Elser <els...@apache.org> Committed: Mon Feb 3 19:18:07 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(-) ----------------------------------------------------------------------
