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/542e71c2 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/542e71c2 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/542e71c2 Branch: refs/heads/trunk Commit: 542e71c26e2df9afa779f963939c656694e654c7 Parents: 7349ec2 61b13b0 Author: Jonathan Ellis <jbel...@apache.org> Authored: Thu Jun 12 14:58:23 2014 -0500 Committer: Jonathan Ellis <jbel...@apache.org> Committed: Thu Jun 12 14:58:23 2014 -0500 ---------------------------------------------------------------------- CHANGES.txt | 1 + src/java/org/apache/cassandra/io/sstable/SSTableRewriter.java | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/542e71c2/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index 3471496,199a0ea..ae8d540 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,14 -1,5 +1,15 @@@ +3.0 + * 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) + + 2.1.0 + * Avoid incremental compaction on Windows (CASSANDRA-7365) * Fix exception when querying a composite-keyed table with a collection index (CASSANDRA-7372) * Use node's host id in place of counter ids (CASSANDRA-7366)
