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/fe043b63 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/fe043b63 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/fe043b63 Branch: refs/heads/cassandra-3.0 Commit: fe043b631e163dd8e83f285ccbb5b16d1dc24137 Parents: 7f6d039 0967825 Author: Yuki Morishita <yu...@apache.org> Authored: Thu Dec 31 12:42:34 2015 -0600 Committer: Yuki Morishita <yu...@apache.org> Committed: Thu Dec 31 12:42:34 2015 -0600 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../org/apache/cassandra/net/OutboundTcpConnectionPool.java | 9 +++++---- 2 files changed, 6 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/fe043b63/CHANGES.txt ----------------------------------------------------------------------
