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/389003fd Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/389003fd Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/389003fd Branch: refs/heads/master Commit: 389003fdeeffbce540c4ac8c1d025c774e6e5eeb Parents: 977d41d da7f937 Author: Josh Elser <els...@apache.org> Authored: Mon Mar 10 18:15:36 2014 -0400 Committer: Josh Elser <els...@apache.org> Committed: Mon Mar 10 18:15:36 2014 -0400 ---------------------------------------------------------------------- .../apache/accumulo/core/util/shell/Shell.java | 20 +-- .../core/util/shell/ShellConfigTest.java | 5 +- .../core/util/shell/ShellSetInstanceTest.java | 3 +- .../accumulo/core/util/shell/ShellTest.java | 5 +- .../apache/accumulo/proxy/SimpleProxyIT.java | 98 +++++++++---- .../org/apache/accumulo/test/ShellServerIT.java | 145 ++++++++++++++----- 6 files changed, 196 insertions(+), 80 deletions(-) ----------------------------------------------------------------------
