Merge branch '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/a03071cd
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/a03071cd
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/a03071cd

Branch: refs/heads/master
Commit: a03071cd3d432542fbe1f277efe053554a67e8fa
Parents: 5d0d6aa 828c3b3
Author: Josh Elser <els...@apache.org>
Authored: Fri Mar 21 18:13:32 2014 -0400
Committer: Josh Elser <els...@apache.org>
Committed: Fri Mar 21 18:13:32 2014 -0400

----------------------------------------------------------------------
 .../apache/accumulo/core/cli/ClientOpts.java    |  8 +-
 .../accumulo/core/cli/TestClientOpts.java       | 82 ++++++++++++++++++--
 2 files changed, 81 insertions(+), 9 deletions(-)
----------------------------------------------------------------------


Reply via email to