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/b48d0da6 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b48d0da6 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b48d0da6 Branch: refs/heads/trunk Commit: b48d0da6d4201e12f99d2ccbc633e1bee5a8d6ea Parents: bcc68fe 0e393c9 Author: Benedict Elliott Smith <bened...@apache.org> Authored: Wed Jul 2 23:42:46 2014 +0100 Committer: Benedict Elliott Smith <bened...@apache.org> Committed: Wed Jul 2 23:42:46 2014 +0100 ---------------------------------------------------------------------- CHANGES.txt | 2 ++ src/java/org/apache/cassandra/db/DefsTables.java | 17 +++++++++++------ src/java/org/apache/cassandra/db/Keyspace.java | 4 ++++ .../apache/cassandra/db/commitlog/CommitLog.java | 17 +++++++++-------- .../cassandra/db/commitlog/CommitLogSegment.java | 6 ++---- .../db/commitlog/CommitLogSegmentManager.java | 11 +++++++++-- .../apache/cassandra/utils/concurrent/OpOrder.java | 7 +++++++ 7 files changed, 44 insertions(+), 20 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/b48d0da6/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index e65a065,22c4123..cfa3dad --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,11 -1,7 +1,13 @@@ +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 * (Windows) handle spaces in path names (CASSANDRA-7451) + * Ensure writes have completed after dropping a table, before recycling + commit log segments (CASSANDRA-7437) Merged from 2.0: * Fix CC#collectTimeOrderedData() tombstone optimisations (CASSANDRA-7394) * Support DISTINCT for static columns and fix behaviour when DISTINC is http://git-wip-us.apache.org/repos/asf/cassandra/blob/b48d0da6/src/java/org/apache/cassandra/db/DefsTables.java ----------------------------------------------------------------------
