Merge branch 'cassandra-2.1.0' into cassandra-2.1
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/aac8e6c7 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/aac8e6c7 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/aac8e6c7 Branch: refs/heads/cassandra-2.1 Commit: aac8e6c7f0ed62284664fc6b81bcdd1e46ca3e03 Parents: afe5024 547cf1d Author: Jonathan Ellis <jbel...@apache.org> Authored: Mon Jul 7 00:13:50 2014 -0500 Committer: Jonathan Ellis <jbel...@apache.org> Committed: Mon Jul 7 00:13:50 2014 -0500 ---------------------------------------------------------------------- CHANGES.txt | 2 ++ bin/cassandra | 7 +++++++ conf/README.txt | 2 ++ .../apache/cassandra/net/MessagingService.java | 18 +++++++++--------- 4 files changed, 20 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/aac8e6c7/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index baee9c9,b609795..b93005e --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,10 -1,5 +1,11 @@@ +2.1.1 + * Improve schema merge performance (CASSANDRA-7444) + * Fix NPE when unknown prepared statement ID is used (CASSANDRA-7454) + * Adjust MT depth based on # of partition validating (CASSANDRA-5263) + * Optimise NativeCell comparisons (CASSANDRA-6755) + 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)