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/a194423d Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/a194423d Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/a194423d Branch: refs/heads/master Commit: a194423d99bfc48543946e97c9da462489d0dc27 Parents: 86ed88a 3346019 Author: Josh Elser <els...@apache.org> Authored: Thu Mar 27 13:27:01 2014 -0700 Committer: Josh Elser <els...@apache.org> Committed: Thu Mar 27 13:27:01 2014 -0700 ---------------------------------------------------------------------- test/pom.xml | 10 ++++++++++ .../test/java/org/apache/accumulo/test/ShellServerIT.java | 9 +++++---- 2 files changed, 15 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/a194423d/test/pom.xml ----------------------------------------------------------------------
