Merge branch '1.6.0-SNAPSHOT' of https://git-wip-us.apache.org/repos/asf/accumulo 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/27843833 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/27843833 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/27843833 Branch: refs/heads/ACCUMULO-2061 Commit: 27843833737bd017e4a56306e0a3140c6dcf3865 Parents: 21ab972 8acdf53 Author: Eric Newton <eric.new...@gmail.com> Authored: Fri Mar 7 11:28:28 2014 -0500 Committer: Eric Newton <eric.new...@gmail.com> Committed: Fri Mar 7 11:28:28 2014 -0500 ---------------------------------------------------------------------- .../org/apache/accumulo/core/util/shell/Shell.java | 14 ++++++++++++-- .../accumulo/core/util/shell/ShellConfigTest.java | 1 + .../core/util/shell/ShellSetInstanceTest.java | 1 + .../apache/accumulo/core/util/shell/ShellTest.java | 6 ++++++ .../java/org/apache/accumulo/test/ShellServerIT.java | 10 +++++----- 5 files changed, 25 insertions(+), 7 deletions(-) ----------------------------------------------------------------------
