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/377105a0 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/377105a0 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/377105a0 Branch: refs/heads/master Commit: 377105a05c906ee240840b5438c813ae46bb2704 Parents: bedf402 6f029b0 Author: Josh Elser <[email protected]> Authored: Mon Sep 29 20:02:09 2014 -0400 Committer: Josh Elser <[email protected]> Committed: Mon Sep 29 20:02:09 2014 -0400 ---------------------------------------------------------------------- .../apache/accumulo/test/functional/SlowIterator.java | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) ----------------------------------------------------------------------
