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/ed65ff99 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ed65ff99 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ed65ff99 Branch: refs/heads/trunk Commit: ed65ff99c1b5972f9c707262aee1335f6bcd4ca7 Parents: 8765e6a 8bb7077 Author: Yuki Morishita <[email protected]> Authored: Tue Sep 29 12:02:07 2015 -0500 Committer: Yuki Morishita <[email protected]> Committed: Tue Sep 29 12:02:07 2015 -0500 ---------------------------------------------------------------------- CHANGES.txt | 1 + src/java/org/apache/cassandra/net/OutboundTcpConnection.java | 2 ++ 2 files changed, 3 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/ed65ff99/CHANGES.txt ----------------------------------------------------------------------
