Merge branch '1.8'
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/240002e6 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/240002e6 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/240002e6 Branch: refs/heads/master Commit: 240002e6366e3e69eb792ec39ac6a847f3ec4330 Parents: ecd345d 36f8fcc Author: Josh Elser <els...@apache.org> Authored: Mon Aug 1 16:55:39 2016 -0400 Committer: Josh Elser <els...@apache.org> Committed: Mon Aug 1 16:55:39 2016 -0400 ---------------------------------------------------------------------- .../org/apache/accumulo/test/ShellServerIT.java | 24 ++++++-------------- 1 file changed, 7 insertions(+), 17 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/240002e6/test/src/main/java/org/apache/accumulo/test/ShellServerIT.java ----------------------------------------------------------------------