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/fd08e758 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/fd08e758 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/fd08e758 Branch: refs/heads/cassandra-3.3 Commit: fd08e758abcecdcca8826406570a05420e7990a9 Parents: d34025a 5006e1c Author: Marcus Eriksson <marc...@apache.org> Authored: Thu Jan 21 09:12:10 2016 +0100 Committer: Marcus Eriksson <marc...@apache.org> Committed: Thu Jan 21 09:12:10 2016 +0100 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../org/apache/cassandra/service/ActiveRepairService.java | 9 ++++----- 2 files changed, 5 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/fd08e758/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index b70464f,dec3ce7..a9ba475 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -24,7 -32,16 +24,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: + * 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) * Log a message when major compaction does not result in a single file (CASSANDRA-10847)
