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/4dd1a15c Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/4dd1a15c Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/4dd1a15c Branch: refs/heads/trunk Commit: 4dd1a15ccc59ebe863c233d88b07dc269aee2cff Parents: 9d05efa 04a1fc6 Author: Aleksey Yeschenko <alek...@apache.org> Authored: Fri Aug 15 04:02:07 2014 +0300 Committer: Aleksey Yeschenko <alek...@apache.org> Committed: Fri Aug 15 04:02:07 2014 +0300 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../cassandra/config/DatabaseDescriptor.java | 37 +++++++------------- 2 files changed, 14 insertions(+), 24 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/4dd1a15c/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index e2e37d6,ea9e8aa..2b38918 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,21 -1,5 +1,22 @@@ +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 + * Validate IPv6 wildcard addresses properly (CASSANDRA-7680) * (cqlsh) Error when tracing query (CASSANDRA-7613) * Avoid IOOBE when building SyntaxError message snippet (CASSANDRA-7569) * SSTableExport uses correct validator to create string representation of partition http://git-wip-us.apache.org/repos/asf/cassandra/blob/4dd1a15c/src/java/org/apache/cassandra/config/DatabaseDescriptor.java ----------------------------------------------------------------------
