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/9ef0fca8 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/9ef0fca8 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/9ef0fca8 Branch: refs/heads/master Commit: 9ef0fca84ccd0cab5153c264fdd84ebaa9e78cb2 Parents: 373711f af8588e Author: Josh Elser <els...@apache.org> Authored: Wed Apr 23 12:45:14 2014 -0400 Committer: Josh Elser <els...@apache.org> Committed: Wed Apr 23 12:45:14 2014 -0400 ---------------------------------------------------------------------- test/pom.xml | 4 ++++ .../test/java/org/apache/accumulo/test/functional/ScannerIT.java | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/9ef0fca8/test/pom.xml ----------------------------------------------------------------------
