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/0a94c7a3 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/0a94c7a3 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/0a94c7a3 Branch: refs/heads/cassandra-3.0 Commit: 0a94c7a36c778e7429c68ac23c018e2f6db1b27e Parents: a472aa9 ed4fad1 Author: Yuki Morishita <yu...@apache.org> Authored: Thu Aug 6 22:06:02 2015 -0500 Committer: Yuki Morishita <yu...@apache.org> Committed: Thu Aug 6 22:06:02 2015 -0500 ---------------------------------------------------------------------- src/java/org/apache/cassandra/net/IncomingTcpConnection.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/0a94c7a3/src/java/org/apache/cassandra/net/IncomingTcpConnection.java ----------------------------------------------------------------------
