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/ecf5ef78 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/ecf5ef78 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/ecf5ef78 Branch: refs/heads/master Commit: ecf5ef7845bdb797435954869929c0ce0f638272 Parents: ae46209 9760742 Author: Josh Elser <els...@apache.org> Authored: Tue Mar 11 14:51:00 2014 -0400 Committer: Josh Elser <els...@apache.org> Committed: Tue Mar 11 14:51:00 2014 -0400 ---------------------------------------------------------------------- test/src/test/java/org/apache/accumulo/test/ShellServerIT.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) ----------------------------------------------------------------------
