Merge branch '1.5.2-SNAPSHOT' into 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/9abf9424 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/9abf9424 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/9abf9424 Branch: refs/heads/master Commit: 9abf9424d8d172d10d2fea8d26f257c2a55208c6 Parents: e057181 bd283ae Author: Mike Drob <md...@cloudera.com> Authored: Tue Mar 4 09:15:29 2014 -0500 Committer: Mike Drob <md...@cloudera.com> Committed: Tue Mar 4 09:15:29 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(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/9abf9424/test/src/main/java/org/apache/accumulo/test/continuous/ContinuousBatchWalker.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/9abf9424/test/src/main/java/org/apache/accumulo/test/continuous/ContinuousWalk.java ----------------------------------------------------------------------
