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/e01de2f7 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/e01de2f7 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/e01de2f7 Branch: refs/heads/master Commit: e01de2f7f7b5a640e99f72723e2fec99459ec888 Parents: cf3e1fe de2168e Author: Josh Elser <els...@apache.org> Authored: Sun Nov 24 23:14:13 2013 -0500 Committer: Josh Elser <els...@apache.org> Committed: Sun Nov 24 23:14:13 2013 -0500 ---------------------------------------------------------------------- .../java/org/apache/accumulo/core/cli/Help.java | 14 ++++-- .../org/apache/accumulo/core/cli/TestHelp.java | 46 ++++++++++++++++++++ 2 files changed, 57 insertions(+), 3 deletions(-) ----------------------------------------------------------------------
