Merge branch 'cassandra-3.0' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/32bb0fd2 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/32bb0fd2 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/32bb0fd2 Branch: refs/heads/trunk Commit: 32bb0fd2aa4336f54d0fcbc410a0f039fc6a38ae Parents: 14c1d62 69013c9 Author: Joshua McKenzie <[email protected]> Authored: Fri Aug 21 14:53:00 2015 -0400 Committer: Joshua McKenzie <[email protected]> Committed: Fri Aug 21 14:53:00 2015 -0400 ---------------------------------------------------------------------- src/java/org/apache/cassandra/net/OutboundTcpConnection.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ----------------------------------------------------------------------
