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/4edc82eb Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/4edc82eb Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/4edc82eb Branch: refs/heads/master Commit: 4edc82eb3f3a1c2c2e1f1052f74af6942bd96efe Parents: ff60586 8acdf53 Author: Bill Havanki <bhava...@cloudera.com> Authored: Fri Mar 7 11:27:03 2014 -0500 Committer: Bill Havanki <bhava...@cloudera.com> Committed: Fri Mar 7 11:27:03 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(-) ----------------------------------------------------------------------
