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/3fc00963 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/3fc00963 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/3fc00963 Branch: refs/heads/master Commit: 3fc0096364d2236d75cd18a5c5361a6aa72bebda Parents: 3815558 684f293 Author: Josh Elser <els...@apache.org> Authored: Fri Jan 24 10:57:48 2014 -0500 Committer: Josh Elser <els...@apache.org> Committed: Fri Jan 24 10:57:48 2014 -0500 ---------------------------------------------------------------------- test/src/test/java/org/apache/accumulo/test/ShellServerIT.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) ----------------------------------------------------------------------
