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/b6344e83 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/b6344e83 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/b6344e83 Branch: refs/heads/master Commit: b6344e83854cea688b1345700f098b90bb68a7e8 Parents: d9e413c 09388f5 Author: Eric C. Newton <eric.new...@gmail.com> Authored: Wed Apr 2 11:04:05 2014 -0400 Committer: Eric C. Newton <eric.new...@gmail.com> Committed: Wed Apr 2 11:04:05 2014 -0400 ---------------------------------------------------------------------- .../src/test/java/org/apache/accumulo/test/ShellServerIT.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) ----------------------------------------------------------------------
