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/cf61a3c2 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/cf61a3c2 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/cf61a3c2 Branch: refs/heads/master Commit: cf61a3c2e3e43f31975536e2ceb5b5023dc32148 Parents: 11d724e 9abf942 Author: Mike Drob <[email protected]> Authored: Tue Mar 4 09:15:41 2014 -0500 Committer: Mike Drob <[email protected]> Committed: Tue Mar 4 09:15:41 2014 -0500 ---------------------------------------------------------------------- .../test/continuous/ContinuousBatchWalker.java | 2 +- .../test/continuous/ContinuousIngest.java | 9 ++-- .../test/continuous/ContinuousQuery.java | 2 +- .../test/continuous/ContinuousScanner.java | 2 +- .../test/continuous/ContinuousUtil.java | 49 ++++++++++++++++++++ .../test/continuous/ContinuousWalk.java | 2 +- 6 files changed, 57 insertions(+), 9 deletions(-) ----------------------------------------------------------------------
