You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by bl...@apache.org on 2015/07/16 14:38:15 UTC
[1/3] cassandra git commit: Fix error message in ReadResponse
Repository: cassandra
Updated Branches:
refs/heads/trunk c29001b94 -> b968ba4e6
Fix error message in ReadResponse
patch by Stefania Alborghetti; review by Benjamin Lerer for CASSANDRA-9460
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/9ff5d44c
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/9ff5d44c
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/9ff5d44c
Branch: refs/heads/trunk
Commit: 9ff5d44c4286a8fdb433e4b580d3f6129745b93b
Parents: dc79a86
Author: Stefania Alborghetti <st...@datastax.com>
Authored: Thu Jul 16 14:25:11 2015 +0200
Committer: blerer <be...@datastax.com>
Committed: Thu Jul 16 14:25:11 2015 +0200
----------------------------------------------------------------------
src/java/org/apache/cassandra/db/ReadResponse.java | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/9ff5d44c/src/java/org/apache/cassandra/db/ReadResponse.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/ReadResponse.java b/src/java/org/apache/cassandra/db/ReadResponse.java
index 6a8aa8c..d8744d3 100644
--- a/src/java/org/apache/cassandra/db/ReadResponse.java
+++ b/src/java/org/apache/cassandra/db/ReadResponse.java
@@ -19,6 +19,7 @@ package org.apache.cassandra.db;
import java.io.*;
import java.nio.ByteBuffer;
+import java.util.Arrays;
import java.util.concurrent.atomic.AtomicReferenceFieldUpdater;
import org.apache.cassandra.io.IVersionedSerializer;
@@ -72,7 +73,9 @@ public class ReadResponse
if (!digestUpdater.compareAndSet(this, curr, digest))
{
assert digest.equals(this.digest) :
- String.format("Digest mismatch : %s vs %s", digest.array(), this.digest.array());
+ String.format("Digest mismatch : %s vs %s",
+ Arrays.toString(digest.array()),
+ Arrays.toString(this.digest.array()));
}
}
[3/3] cassandra git commit: Merge branch 'cassandra-2.2' into trunk
Posted by bl...@apache.org.
Merge branch 'cassandra-2.2' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/b968ba4e
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b968ba4e
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b968ba4e
Branch: refs/heads/trunk
Commit: b968ba4e60a7f094f9981ae029f7dba43f4f64b2
Parents: c29001b 5e930e4
Author: blerer <be...@datastax.com>
Authored: Thu Jul 16 14:33:14 2015 +0200
Committer: blerer <be...@datastax.com>
Committed: Thu Jul 16 14:33:46 2015 +0200
----------------------------------------------------------------------
----------------------------------------------------------------------
[2/3] cassandra git commit: Merge branch 'cassandra-2.1' into
cassandra-2.2
Posted by bl...@apache.org.
Merge branch 'cassandra-2.1' into cassandra-2.2
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/5e930e4e
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5e930e4e
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5e930e4e
Branch: refs/heads/trunk
Commit: 5e930e4e1b46233011675f08ebdf5f4c10137332
Parents: 82e2004 9ff5d44
Author: blerer <be...@datastax.com>
Authored: Thu Jul 16 14:30:35 2015 +0200
Committer: blerer <be...@datastax.com>
Committed: Thu Jul 16 14:30:58 2015 +0200
----------------------------------------------------------------------
src/java/org/apache/cassandra/db/ReadResponse.java | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------