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/5aaa4a02 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5aaa4a02 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5aaa4a02 Branch: refs/heads/trunk Commit: 5aaa4a0270f421a2bfde6246a48b1350bebb4cd6 Parents: 9b4c4ef 50fc8ba Author: Brandon Williams <[email protected]> Authored: Wed Aug 13 14:25:37 2014 -0500 Committer: Brandon Williams <[email protected]> Committed: Wed Aug 13 14:25:37 2014 -0500 ---------------------------------------------------------------------- CHANGES.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/5aaa4a02/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index 4ed4d51,f34cec7..99fe367 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,22 -1,4 +1,21 @@@ +3.0 + * Support pure user-defined functions (CASSANDRA-7395) + * 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) + + 2.1.1 - * (Hadoop) Add CqlOutputFormat (CASSANDRA-6927) * Avoid IOOBE when building SyntaxError message snippet (CASSANDRA-7569) * SSTableExport uses correct validator to create string representation of partition keys (CASSANDRA-7498)
