Merge branch 'cassandra-2.2' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/38ff10d3 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/38ff10d3 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/38ff10d3 Branch: refs/heads/trunk Commit: 38ff10d3dc1dd991f7c483cd58e391b6a70ed081 Parents: 5f4cc45 33e3af5 Author: Yuki Morishita <yu...@apache.org> Authored: Wed Jul 29 14:39:20 2015 -0500 Committer: Yuki Morishita <yu...@apache.org> Committed: Wed Jul 29 14:39:20 2015 -0500 ---------------------------------------------------------------------- CHANGES.txt | 1 + src/java/org/apache/cassandra/net/OutboundTcpConnection.java | 6 +++++- 2 files changed, 6 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/38ff10d3/CHANGES.txt ----------------------------------------------------------------------
