Merge branch 'cassandra-2.2' into cassandra-3.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/69013c95 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/69013c95 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/69013c95 Branch: refs/heads/cassandra-3.0 Commit: 69013c95b6a0f8e6100a61fc8c03385a8037db3a Parents: f60322a dd19a7f Author: Joshua McKenzie <jmcken...@apache.org> Authored: Fri Aug 21 14:52:50 2015 -0400 Committer: Joshua McKenzie <jmcken...@apache.org> Committed: Fri Aug 21 14:52:50 2015 -0400 ---------------------------------------------------------------------- src/java/org/apache/cassandra/net/OutboundTcpConnection.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ----------------------------------------------------------------------
