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 <benjamin.le...@datastax.com> Authored: Wed Jul 15 12:05:11 2015 +0200 Committer: blerer <benjamin.le...@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 ----------------------------------------------------------------------