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/6739434c Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6739434c Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/6739434c Branch: refs/heads/trunk Commit: 6739434c6ffa7a501989fb5f787d408e51d0a135 Parents: 9e28938 14d7a63 Author: Robert Stupp <sn...@snazy.de> Authored: Sun Jun 28 10:37:00 2015 +0200 Committer: Robert Stupp <sn...@snazy.de> Committed: Sun Jun 28 10:37:00 2015 +0200 ---------------------------------------------------------------------- CHANGES.txt | 3 +++ .../apache/cassandra/net/MessagingService.java | 2 +- .../cassandra/net/OutboundTcpConnection.java | 2 +- .../cassandra/service/AbstractReadExecutor.java | 12 ++++++++++++ .../apache/cassandra/service/ReadCallback.java | 20 ++++++++++++++++++-- .../cassandra/service/RowDataResolver.java | 2 ++ 6 files changed, 37 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/6739434c/CHANGES.txt ----------------------------------------------------------------------
