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/15 12:06:24 UTC
[2/2] cassandra git commit: Merge remote-tracking branch
'asf/cassandra-2.1' into cassandra-2.2
Merge remote-tracking branch 'asf/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/af0cd32b
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/af0cd32b
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/af0cd32b
Branch: refs/heads/cassandra-2.2
Commit: af0cd32be5d3d855674a9f77e0350a039fda4dfe
Parents: c33ebcd b16d8c9
Author: blerer <be...@datastax.com>
Authored: Wed Jul 15 12:05:11 2015 +0200
Committer: blerer <be...@datastax.com>
Committed: Wed Jul 15 12:05:11 2015 +0200
----------------------------------------------------------------------
.../org/apache/cassandra/db/ReadResponse.java | 26 ++++++++++++++++----
.../service/RangeSliceResponseResolver.java | 14 +++++------
.../apache/cassandra/service/ReadCallback.java | 1 +
.../cassandra/service/RowDigestResolver.java | 10 +++++++-
4 files changed, 38 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/af0cd32b/src/java/org/apache/cassandra/service/ReadCallback.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/af0cd32b/src/java/org/apache/cassandra/service/RowDigestResolver.java
----------------------------------------------------------------------