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/d7819232 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d7819232 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/d7819232 Branch: refs/heads/cassandra-3.3 Commit: d7819232275974f4ee06c62863f64a33cd9a3281 Parents: 501f75b 7aa4dc5 Author: T Jake Luciani <j...@apache.org> Authored: Fri Jan 15 09:46:59 2016 -0500 Committer: T Jake Luciani <j...@apache.org> Committed: Fri Jan 15 09:46:59 2016 -0500 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../cassandra/service/StorageService.java | 103 ++++++++++++------- 2 files changed, 69 insertions(+), 35 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/d7819232/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index 991077d,a088cfe..950aaaf --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -19,7 -27,16 +19,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: + * Allow simultaneous bootstrapping with strict consistency when no vnodes are used (CASSANDRA-11005) * Log a message when major compaction does not result in a single file (CASSANDRA-10847) * (cqlsh) fix cqlsh_copy_tests when vnodes are disabled (CASSANDRA-10997) * (cqlsh) Add request timeout option to cqlsh (CASSANDRA-10686) http://git-wip-us.apache.org/repos/asf/cassandra/blob/d7819232/src/java/org/apache/cassandra/service/StorageService.java ----------------------------------------------------------------------
