Merge branch 'cassandra-2.1' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/17a4fbda Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/17a4fbda Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/17a4fbda Branch: refs/heads/trunk Commit: 17a4fbdaac4562db475272b79c94fa90aa423dd8 Parents: 7f26410 9873960 Author: Aleksey Yeschenko <[email protected]> Authored: Tue Oct 7 18:44:19 2014 +0300 Committer: Aleksey Yeschenko <[email protected]> Committed: Tue Oct 7 18:44:19 2014 +0300 ---------------------------------------------------------------------- CHANGES.txt | 4 ++++ .../cassandra/net/IncomingTcpConnection.java | 21 ++++++++++---------- .../apache/cassandra/net/MessagingService.java | 2 +- .../cassandra/net/OutboundTcpConnection.java | 7 +++++-- 4 files changed, 20 insertions(+), 14 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/17a4fbda/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/17a4fbda/src/java/org/apache/cassandra/net/MessagingService.java ----------------------------------------------------------------------
