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/0db50745 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/0db50745 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/0db50745 Branch: refs/heads/trunk Commit: 0db5074549987c5b534f5b5ddf9402aea7a3d837 Parents: b912505 0793e56 Author: Marcus Eriksson <marc...@apache.org> Authored: Thu Oct 2 11:35:12 2014 +0200 Committer: Marcus Eriksson <marc...@apache.org> Committed: Thu Oct 2 11:35:12 2014 +0200 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../db/compaction/CompactionController.java | 24 ++++++++++++++++++-- .../cassandra/db/compaction/CompactionTask.java | 7 ++++++ 3 files changed, 30 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/0db50745/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index 1b032e4,95218cb..5aec2e7 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,33 -1,5 +1,34 @@@ +3.0 + * Remove cassandra-cli (CASSANDRA-7920) + * Optimize java source-based UDF invocation (CASSANDRA-7924) + * Accept dollar quoted strings in CQL (CASSANDRA-7769) + * Make assassinate a first class command (CASSANDRA-7935) + * Support IN clause on any clustering column (CASSANDRA-4762) + * Improve compaction logging (CASSANDRA-7818) + * Remove YamlFileNetworkTopologySnitch (CASSANDRA-7917) + * Support Java source code for user-defined functions (CASSANDRA-7562) + * Require arg types to disambiguate UDF drops (CASSANDRA-7812) + * Do anticompaction in groups (CASSANDRA-6851) + * Verify that UDF class methods are static (CASSANDRA-7781) + * Support pure user-defined functions (CASSANDRA-7395, 7740) + * 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-7028) + * Make incremental repair default (CASSANDRA-7250) + * Enable code coverage thru JaCoCo (CASSANDRA-7226) + * Switch external naming of 'column families' to 'tables' (CASSANDRA-4369) + * Shorten SSTable path (CASSANDRA-6962) + * Use unsafe mutations for most unit tests (CASSANDRA-6969) + * Fix race condition during calculation of pending ranges (CASSANDRA-7390) + * Fail on very large batch sizes (CASSANDRA-8011) + + 2.1.1 + * Release references to overlapping sstables during compaction (CASSANDRA-7819) * Send notification when opening compaction results early (CASSANDRA-8034) * Make native server start block until properly bound (CASSANDRA-7885) * (cqlsh) Fix IPv6 support (CASSANDRA-7988) http://git-wip-us.apache.org/repos/asf/cassandra/blob/0db50745/src/java/org/apache/cassandra/db/compaction/CompactionTask.java ----------------------------------------------------------------------
