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/3b014d07 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/3b014d07 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/3b014d07 Branch: refs/heads/trunk Commit: 3b014d077ed47a09c4027584ebd4e2795cf0f62f Parents: 01a10f0 13314aa Author: Sylvain Lebresne <sylv...@datastax.com> Authored: Fri Jan 22 15:44:50 2016 +0100 Committer: Sylvain Lebresne <sylv...@datastax.com> Committed: Fri Jan 22 15:44:50 2016 +0100 ---------------------------------------------------------------------- CHANGES.txt | 1 + src/java/org/apache/cassandra/gms/Gossiper.java | 10 ++- .../org/apache/cassandra/gms/GossiperTest.java | 93 ++++++++++++++++++++ 3 files changed, 100 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/3b014d07/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index a1ec744,e93a04a..afaf114 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -27,7 -35,16 +27,8 @@@ Merged from 2.2 * Optimize pending range computation (CASSANDRA-9258) * Skip commit log and saved cache directories in SSTable version startup check (CASSANDRA-10902) * drop/alter user should be case sensitive (CASSANDRA-10817) - * jemalloc detection fails due to quoting issues in regexv (CASSANDRA-10946) - * (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: + * Fix bad gossip generation seen in long-running clusters (CASSANDRA-10969) * Avoid NPE when incremental repair fails (CASSANDRA-10909) * Unmark sstables compacting once they are done in cleanup/scrub/upgradesstables (CASSANDRA-10829) * Allow simultaneous bootstrapping with strict consistency when no vnodes are used (CASSANDRA-11005)
