Merge branch '1.7'
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/56e60ca0 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/56e60ca0 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/56e60ca0 Branch: refs/heads/master Commit: 56e60ca09d3c056ead1957f205a410a098305f7c Parents: 24a693b 3622556 Author: Josh Elser <els...@apache.org> Authored: Sun Jul 26 19:47:40 2015 -0400 Committer: Josh Elser <els...@apache.org> Committed: Sun Jul 26 19:47:40 2015 -0400 ---------------------------------------------------------------------- .../org/apache/accumulo/shell/ShellOptionsJC.java | 5 +++++ .../apache/accumulo/shell/ShellOptionsJCTest.java | 17 ++++++++++++++--- 2 files changed, 19 insertions(+), 3 deletions(-) ----------------------------------------------------------------------
