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/7f6c2131 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/7f6c2131 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/7f6c2131 Branch: refs/heads/ACCUMULO-2061 Commit: 7f6c213108538b0a7aaf79e349dbe4551f8afae2 Parents: 2f7b9d3 5d9e155 Author: Mike Drob <md...@cloudera.com> Authored: Tue Mar 4 14:24:07 2014 -0500 Committer: Mike Drob <md...@cloudera.com> Committed: Tue Mar 4 14:24:07 2014 -0500 ---------------------------------------------------------------------- .../accumulo/test/continuous/ContinuousVerify.java | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/7f6c2131/test/src/main/java/org/apache/accumulo/test/continuous/ContinuousVerify.java ----------------------------------------------------------------------
