Merge branch '1.5.1-SNAPSHOT' 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/de2168e0 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/de2168e0 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/de2168e0 Branch: refs/heads/master Commit: de2168e0b8cbd2e5740eb28512ee29a8c0ace842 Parents: 7d24ff5 100e75b Author: Josh Elser <els...@apache.org> Authored: Sun Nov 24 23:09:21 2013 -0500 Committer: Josh Elser <els...@apache.org> Committed: Sun Nov 24 23:09:21 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(-) ----------------------------------------------------------------------
