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/12997504 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/12997504 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/12997504 Branch: refs/heads/trunk Commit: 12997504bc2c3ccfaab50c4c250dfdcb1ca9260c Parents: 847f413 649a5cd Author: Brandon Williams <[email protected]> Authored: Thu Feb 26 10:30:32 2015 -0800 Committer: Brandon Williams <[email protected]> Committed: Thu Feb 26 10:30:32 2015 -0800 ---------------------------------------------------------------------- src/java/org/apache/cassandra/net/OutboundTcpConnection.java | 2 ++ 1 file changed, 2 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/12997504/src/java/org/apache/cassandra/net/OutboundTcpConnection.java ----------------------------------------------------------------------
