Merge branch 'cassandra-3.3' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/273ea780 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/273ea780 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/273ea780 Branch: refs/heads/trunk Commit: 273ea780d803547d0575f90dbb5b97314caf3b2a Parents: 267ab31 b2af80b Author: Sam Tunnicliffe <[email protected]> Authored: Fri Jan 8 16:10:16 2016 +0000 Committer: Sam Tunnicliffe <[email protected]> Committed: Fri Jan 8 16:10:16 2016 +0000 ---------------------------------------------------------------------- CHANGES.txt | 1 + src/java/org/apache/cassandra/gms/Gossiper.java | 13 ++++++++++--- .../apache/cassandra/net/IncomingTcpConnection.java | 2 ++ .../apache/cassandra/net/OutboundTcpConnection.java | 2 ++ 4 files changed, 15 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/273ea780/CHANGES.txt ----------------------------------------------------------------------
