Merge branch 'cassandra-2.1' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/7000bde6 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/7000bde6 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/7000bde6 Branch: refs/heads/trunk Commit: 7000bde6c6b69781a2fbe715bcd2bbf5c899f9d8 Parents: 8322ec2 e88b888 Author: Aleksey Yeschenko <alek...@apache.org> Authored: Wed Jun 25 14:56:48 2014 -0700 Committer: Aleksey Yeschenko <alek...@apache.org> Committed: Wed Jun 25 14:56:48 2014 -0700 ---------------------------------------------------------------------- CHANGES.txt | 1 + src/java/org/apache/cassandra/db/CollationController.java | 9 ++++----- 2 files changed, 5 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/7000bde6/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index d01e27a,53d388a..7bb783e --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,18 -1,6 +1,19 @@@ +3.0 + * Permit configurable timestamps with cassandra-stress (CASSANDRA-7416) + * Move sstable RandomAccessReader to nio2, which allows using the + FILE_SHARE_DELETE flag on Windows (CASSANDRA-4050) + * Remove CQL2 (CASSANDRA-5918) + * Add Thrift get_multi_slice call (CASSANDRA-6757) + * Optimize fetching multiple cells by name (CASSANDRA-6933) + * Allow compilation in java 8 (CASSANDRA-7208) + * Make incremental repair default (CASSANDRA-7250) + * Enable code coverage thru JaCoCo (CASSANDRA-7226) + * Switch external naming of 'column families' to 'tables' (CASSANDRA-4369) + + 2.1.0 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). http://git-wip-us.apache.org/repos/asf/cassandra/blob/7000bde6/src/java/org/apache/cassandra/db/CollationController.java ----------------------------------------------------------------------
