Merge branch '1.6'
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/87208e5d Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/87208e5d Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/87208e5d Branch: refs/heads/master Commit: 87208e5de1aacb5e7b2487dafba7705f6237ec80 Parents: 4a9cabe 775cdb1 Author: Eric C. Newton <eric.new...@gmail.com> Authored: Wed Mar 4 10:31:47 2015 -0500 Committer: Eric C. Newton <eric.new...@gmail.com> Committed: Wed Mar 4 10:31:47 2015 -0500 ---------------------------------------------------------------------- test/src/test/java/org/apache/accumulo/harness/AccumuloIT.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) ----------------------------------------------------------------------