Merge branch '1.6'
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/990dafbb Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/990dafbb Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/990dafbb Branch: refs/heads/master Commit: 990dafbb2f6e15e3da91671b0506a1d8013269fd Parents: 678a378 f6dd62f Author: Josh Elser <els...@apache.org> Authored: Tue Feb 17 19:15:27 2015 -0500 Committer: Josh Elser <els...@apache.org> Committed: Tue Feb 17 19:15:27 2015 -0500 ---------------------------------------------------------------------- .../org/apache/accumulo/test/ShellServerIT.java | 26 ++++++++++++-------- 1 file changed, 16 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/990dafbb/test/src/test/java/org/apache/accumulo/test/ShellServerIT.java ----------------------------------------------------------------------
