Merge remote-tracking branch 'origin/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/d13cc767 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/d13cc767 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/d13cc767 Branch: refs/heads/master Commit: d13cc767574d4c315a2f05482b7b9e9f89b15394 Parents: 3fd5fa9 ae20140 Author: John Vines <vi...@apache.org> Authored: Mon Feb 3 19:11:10 2014 -0500 Committer: John Vines <vi...@apache.org> Committed: Mon Feb 3 19:11:10 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(-) ----------------------------------------------------------------------
