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/eca74ad2 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/eca74ad2 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/eca74ad2 Branch: refs/heads/cassandra-3.3 Commit: eca74ad240b13ad2d051a9a1ca42162afdaf3bea Parents: 9c1679d e8bd8a4 Author: Sam Tunnicliffe <s...@beobal.com> Authored: Fri Jan 8 16:07:26 2016 +0000 Committer: Sam Tunnicliffe <s...@beobal.com> Committed: Fri Jan 8 16:07:26 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/eca74ad2/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/eca74ad2/src/java/org/apache/cassandra/gms/Gossiper.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/eca74ad2/src/java/org/apache/cassandra/net/IncomingTcpConnection.java ----------------------------------------------------------------------
