merge from 2.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/547cf1d1 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/547cf1d1 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/547cf1d1 Branch: refs/heads/cassandra-2.1.0 Commit: 547cf1d10d933684dbeaeeb9aa0593973d4dc87e Parents: 48ff36a a14211f Author: Jonathan Ellis <jbel...@apache.org> Authored: Mon Jul 7 00:13:44 2014 -0500 Committer: Jonathan Ellis <jbel...@apache.org> Committed: Mon Jul 7 00:13:44 2014 -0500 ---------------------------------------------------------------------- CHANGES.txt | 1 + bin/cassandra | 7 +++++++ 2 files changed, 8 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/547cf1d1/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index aa20d84,23be338..b609795 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,16 -1,5 +1,17 @@@ -2.0.10 +2.1.0 + * Fix ClassCastException processing expired messages (CASSANDRA-7496) + * Fix prepared marker for collections inside UDT (CASSANDRA-7472) + * Remove left-over populate_io_cache_on_flush and replicate_on_write + uses (CASSANDRA-7493) + * (Windows) handle spaces in path names (CASSANDRA-7451) + * Ensure writes have completed after dropping a table, before recycling + commit log segments (CASSANDRA-7437) + * Remove left-over rows_per_partition_to_cache (CASSANDRA-7493) +Merged from 2.0: + * Fix CC#collectTimeOrderedData() tombstone optimisations (CASSANDRA-7394) + * Support DISTINCT for static columns and fix behaviour when DISTINC is + not use (CASSANDRA-7305). + * Workaround JVM NPE on JMX bind failure (CASSANDRA-7254) * Fix race in FileCacheService RemovalListener (CASSANDRA-7278) * Fix inconsistent use of consistencyForCommit that allowed LOCAL_QUORUM operations to incorrect become full QUORUM (CASSANDRA-7345) http://git-wip-us.apache.org/repos/asf/cassandra/blob/547cf1d1/bin/cassandra ----------------------------------------------------------------------