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/642e6c54 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/642e6c54 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/642e6c54 Branch: refs/heads/trunk Commit: 642e6c541ba239b02d650a14e170982e7e73fe7c Parents: f0635da f26e86c Author: Aleksey Yeschenko <alek...@apache.org> Authored: Fri Aug 15 23:44:30 2014 +0300 Committer: Aleksey Yeschenko <alek...@apache.org> Committed: Fri Aug 15 23:44:30 2014 +0300 ---------------------------------------------------------------------- CHANGES.txt | 1 + src/java/org/apache/cassandra/tools/NodeTool.java | 8 ++++++-- 2 files changed, 7 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/642e6c54/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index 069012b,b68605e..570c409 --- 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 + * Add max live/tombstoned cells to nodetool cfstats output (CASSANDRA-7731) * Validate IPv6 wildcard addresses properly (CASSANDRA-7680) * (cqlsh) Error when tracing query (CASSANDRA-7613) * Avoid IOOBE when building SyntaxError message snippet (CASSANDRA-7569) http://git-wip-us.apache.org/repos/asf/cassandra/blob/642e6c54/src/java/org/apache/cassandra/tools/NodeTool.java ----------------------------------------------------------------------
