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/b3205260 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/b3205260 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/b3205260 Branch: refs/heads/master Commit: b3205260c88f1b503c0a3d4a2e2cfa992455cb7c Parents: 62f244d 6c4fa8e Author: Eric Newton <eric.new...@gmail.com> Authored: Mon Jan 13 15:04:05 2014 -0500 Committer: Eric Newton <eric.new...@gmail.com> Committed: Mon Jan 13 15:04:05 2014 -0500 ---------------------------------------------------------------------- .../test/java/org/apache/accumulo/test/functional/ScannerIT.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ----------------------------------------------------------------------
