Merge branch 'cassandra-2.1' into cassandra-2.2
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/476b68a3 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/476b68a3 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/476b68a3 Branch: refs/heads/cassandra-3.0 Commit: 476b68a3d78702bc0b6052bdb6b94a7507b7ced1 Parents: 47e8ef9 1b02a6e Author: Marcus Eriksson <marc...@apache.org> Authored: Tue Jan 19 09:02:40 2016 +0100 Committer: Marcus Eriksson <marc...@apache.org> Committed: Tue Jan 19 09:04:30 2016 +0100 ---------------------------------------------------------------------- CHANGES.txt | 1 + src/java/org/apache/cassandra/db/ColumnFamilyStore.java | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/476b68a3/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index f571c29,9b1b79c..7003c9c --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,25 -1,6 +1,26 @@@ -2.1.13 +2.2.5 + * Make UUID LSB unique per process (CASSANDRA-7925) + * Avoid NPE when performing sstable tasks (scrub etc.) (CASSANDRA-10980) + * Make sure client gets tombstone overwhelmed warning (CASSANDRA-9465) + * Fix error streaming section more than 2GB (CASSANDRA-10961) + * (cqlsh) Also apply --connect-timeout to control connection + timeout (CASSANDRA-10959) + * Histogram buckets exposed in jmx are sorted incorrectly (CASSANDRA-10975) + * Enable GC logging by default (CASSANDRA-10140) + * 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) + * Support counter-columns for native aggregates (sum,avg,max,min) (CASSANDRA-9977) + * (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: + * Unmark sstables compacting once they are done in cleanup/scrub/upgradesstables (CASSANDRA-10829) - * Revert CASSANDRA-10012 and add more logging (CASSANDRA-10961) * 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) http://git-wip-us.apache.org/repos/asf/cassandra/blob/476b68a3/src/java/org/apache/cassandra/db/ColumnFamilyStore.java ----------------------------------------------------------------------
