Merge branch 'cassandra-3.0' into cassandra-3.3
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/b2af80b4 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b2af80b4 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b2af80b4 Branch: refs/heads/trunk Commit: b2af80b4acdc9db4cdd9c26cc81f4336e2ebfccc Parents: 3ad6090 eca74ad Author: Sam Tunnicliffe <[email protected]> Authored: Fri Jan 8 16:08:53 2016 +0000 Committer: Sam Tunnicliffe <[email protected]> Committed: Fri Jan 8 16:08:53 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/b2af80b4/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index 92493d7,25c93e9..edb5bc0 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -52,7 -21,12 +52,8 @@@ Merged from 2.2 * (cqlsh) show correct column names for empty result sets (CASSANDRA-9813) * Add new types to Stress (CASSANDRA-9556) * Add property to allow listening on broadcast interface (CASSANDRA-9748) - * Fix regression in split size on CqlInputFormat (CASSANDRA-10835) - * Better handling of SSL connection errors inter-node (CASSANDRA-10816) - * Disable reloading of GossipingPropertyFileSnitch (CASSANDRA-9474) - * Verify tables in pseudo-system keyspaces at startup (CASSANDRA-10761) Merged from 2.1: + * Retry sending gossip syn multiple times during shadow round (CASSANDRA-8072) * Fix pending range calculation during moves (CASSANDRA-10887) * Sane default (200Mbps) for inter-DC streaming througput (CASSANDRA-9708) * Match cassandra-loader options in COPY FROM (CASSANDRA-9303) http://git-wip-us.apache.org/repos/asf/cassandra/blob/b2af80b4/src/java/org/apache/cassandra/net/IncomingTcpConnection.java ----------------------------------------------------------------------
