You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by el...@apache.org on 2014/06/14 06:36:04 UTC

[23/50] [abbrv] git commit: Merge branch '1.5.2-SNAPSHOT' into 1.6.1-SNAPSHOT

Merge branch '1.5.2-SNAPSHOT' into 1.6.1-SNAPSHOT


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/0af28839
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/0af28839
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/0af28839

Branch: refs/heads/ACCUMULO-378
Commit: 0af2883910ee53d3b424726fcb748b43e82a1ff1
Parents: f34230f 67bc847
Author: Eric Newton <er...@gmail.com>
Authored: Thu Jun 12 19:30:13 2014 -0400
Committer: Eric Newton <er...@gmail.com>
Committed: Thu Jun 12 19:30:13 2014 -0400

----------------------------------------------------------------------
 .../test/continuous/ContinuousVerify.java        |  4 +++-
 .../accumulo/test/continuous/Histogram.java      |  8 +++-----
 .../test/continuous/PrintScanTimeHistogram.java  | 19 +++++++++++--------
 3 files changed, 17 insertions(+), 14 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/0af28839/test/src/main/java/org/apache/accumulo/test/continuous/ContinuousVerify.java
----------------------------------------------------------------------
diff --cc test/src/main/java/org/apache/accumulo/test/continuous/ContinuousVerify.java
index ea0614b,ebeee8a..d31cb8c
--- a/test/src/main/java/org/apache/accumulo/test/continuous/ContinuousVerify.java
+++ b/test/src/main/java/org/apache/accumulo/test/continuous/ContinuousVerify.java
@@@ -92,9 -74,9 +94,9 @@@ public class ContinuousVerify extends C
        try {
          ContinuousWalk.validate(key, data);
        } catch (BadChecksumException bce) {
 -        CounterUtils.increment(context.getCounter(Counts.CORRUPT));
 +        increment(context.getCounter(Counts.CORRUPT));
          if (corrupt < 1000) {
-           System.out.println("ERROR Bad checksum : " + key);
+           log.error("Bad checksum : " + key);
          } else if (corrupt == 1000) {
            System.out.println("Too many bad checksums, not printing anymore!");
          }