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/94604ced Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/94604ced Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/94604ced Branch: refs/heads/trunk Commit: 94604cedaa26e3cb3c219f06cda076dba8c42198 Parents: dd816b3 0b05203 Author: Yuki Morishita <yu...@apache.org> Authored: Fri Jan 22 11:43:51 2016 -0600 Committer: Yuki Morishita <yu...@apache.org> Committed: Fri Jan 22 11:43:51 2016 -0600 ---------------------------------------------------------------------- CHANGES.txt | 1 + src/java/org/apache/cassandra/service/StorageService.java | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/94604ced/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index 94b723c,bb26b20..ed56a78 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -30,7 -38,17 +30,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) - * (cqlsh) encode input correctly when saving history Merged from 2.1: + * Fix isJoined return true only after becoming cluster member (CASANDRA-11007) * 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) http://git-wip-us.apache.org/repos/asf/cassandra/blob/94604ced/src/java/org/apache/cassandra/service/StorageService.java ----------------------------------------------------------------------
